Way to reach correct implementation of macros added