Added PaymentService and ShippingService