Refactoring PropertiesManager