Updated PropertiesData class