Refactors to singleton PostalCode