now initial support for macros