Updated time class