Updated macros example
Updated build