Redo time zones handling