Addition of TimeZone client and refactoring