Updated to support time zones.