Timeline refactoring