Updated to support timezones.