Updated preprocessor macros