New AEM adapters