Added support for timezones