Merge DataSource into Clock, there are no more benefits in separating them