Refactored properties module as PropertiesContainer class