Added tracking of leave times