Added some compatibility macros