CWRC entry schema modifications