Major rework on Hub, minor rework on TimeScheduler