Update clock and divider to use new object