Changed return type of the builder methods
Fixed small bug in the timing of the SimulatedScheduleService