Ilya's recommit: Schedule Interface

Merged changes on local branch. Fixed annotation conflict bug.