Add time zone support