Adding more structure to CRM plugin