Added necessary AAS macros