Added custom macros