Adapted to new api, only missing schedules