Added SystemProperties class. Code refactoring.