Enhanced preprocessor