Complete - task : Add custom macro parsing