Updated PropertiesUtil