Add separate billingPhone and shippingPhone fields to CreditCard
Add AbstractGateway dependency getters and setters