Integrate the module schedule
fixes #21