CRM-14508 Change to access component