Updated time handling