Added some clockwork specific code