Improvements to timeline manager