Added AOS macros