Added DEPRECATED macros