Addded clockwork support