Added required macros