added missing macros