Changed timezone support to be clearer.