Added changes for Canonical CYPs not found problem