Scheduling revision and (some) Room implementation