Improved PropertiesFileReader