Added time zone support