Refactor to a TimeLine service