Extend macro functionality