Handle errors better
Added reference from scheduler
Update new version
Merged with scheduler references