Adding service time tracking