Added missing macros