Refactor
Added compiled macro