Code changes to add files for cr and rg