Updates to use Clock.