More consistency in crm.models