Add clockwork support