Added plugin/preprocessor support