[IMP-dev] Pulling out the macros