Zones Repository refactoring.