added clockwork support