Extend OSOM for patching CRs