Modify generic related macros