Add the ability to specify the clock to Viewer.