- Repository Refactor (Crm blocks)