Upgraded to use official GR8 CRM plugins