Improvements to AE integration