Adding some missing macros