Add 'AEO' - Closes #4423