Refactoring of the postal code model