Added zip, postcode rules - organised rules