Adding missing macros