Added prefix handling to preprocessor