OVERRIDE macros deprecated