Refactored TimeLine/TimeLineModel