ParameterSet.java now contains all relevant factors