Split out BillingAddress and ShippingAddress so that they can have different validations