Preprocessor updates