Update resource loading for CRM-11612