(core) Playing with a union Schedule
(core) Renaming things basically
(core) reduce verboseness of signatures.

It's not neccessary to be so explicit