refactored loading of properties.