Refactor: Timeline