Major updates to scheduler