Updated timezone handling