Added system macros