code refactoring
support for timezones in mapping