Simplified some macros