Added PropertiesUtil, some refactoring