Added support for clockwork