Timelines refactored and added