Modifications to scheduler model and view