Add option to make Clock static