Modifications to preprocessor