Initial implementation of macros