Use proper macros