Massive updates to the time framework