[IMP] CRM: Improve code.