Add more features to crm module