Added some basic support for timezones