Refactoring of zones data