Improved Timeline handling