Updates to CofCs prototypes