Added several macros