Updated support for time changes