Refactor CRM model