Time handling updated