Added in new Timeline class