Added some extra preprocessor flags/variables for output-management.