Improvements for new ParameterFile