#152 Timeline refactoring.