Update resources to be compatible with CRM-11612