Add possibility to disable the macro