Added debug macros