Include latest AOM refactoring