Added aas macros