Replaced static methods with macros