Fix timeline implementation