Added support for different CRM modules