Update to support altered preprocessor