Split out DataSource again, create only two instances of Clock object (constant one only when needed by Configuration)