Some timeline refactoring