More scheduling and callbacks added