Performance boost in TimeManager
Improved safety of the time manager, needed for future commit.