diff --git a/Sources/PayPal/API/Controller.swift b/Sources/PayPal/API/Controller.swift
index 0df0a72b..eae80394 100644
--- a/Sources/PayPal/API/Controller.swift
+++ b/Sources/PayPal/API/Controller.swift
@@ -9,6 +9,11 @@ public protocol PayPalController: ServiceType {
     /// The API resource that the controller connects to.
     var resource: String { get }
     
+    /// The version of the PayPal API to use when making request's to the API.
+    ///
+    /// Defaults to `.v1`.
+    var version: Version { get }
+    
     /// Creates an instance of the controller on a given container.
     ///
     /// Instead of directly initializing the controller, you should register
@@ -16,11 +21,6 @@ public protocol PayPalController: ServiceType {
     ///
     /// - Parameter container: The container that the controller belongs to.
     init(container: Container)
-    
-    /// The controller's path used on the PayPal API.
-    ///
-    /// The default value is `v{Configuration.version}/{resource}/`.
-    func path()throws -> String
 }
 
 extension PayPalController {
@@ -31,10 +31,22 @@ extension PayPalController {
     }
     
     /// The controller's path used on the PayPal API.
+    public var path: String {
+        return "v" + self.version.rawValue + "/" + resource + "/"
+    }
+    
+    /// Fetches the registered `PayPalClient` instance from the container and makes it
+    /// availible in a closure, so any errors that are thrown can be caught and returned in the resulting future.
+    ///
+    /// - Parameter closure: The closure you have access to the `PayPalClient` in.
     ///
-    /// The default value is `v{Configuration.version}/{resource}/`.
-    public func path()throws -> String {
-        let config = try self.container.make(Configuration.self)
-        return "v" + config.version + "/" + resource + "/"
+    /// - Returns: The future returned from the closure passed in.
+    public func client<T>(_ closure: (PayPalClient)throws -> (Future<T>)) -> Future<T> {
+        do {
+            let client = try self.container.make(PayPalClient.self)
+            return try closure(client)
+        } catch let error {
+            return self.container.future(error: error)
+        }
     }
 }
diff --git a/Sources/PayPal/API/Controllers/Activities.swift b/Sources/PayPal/API/Controllers/Activities.swift
index 13442115..778cbf7d 100644
--- a/Sources/PayPal/API/Controllers/Activities.swift
+++ b/Sources/PayPal/API/Controllers/Activities.swift
@@ -15,10 +15,14 @@ public final class Activities: PayPalController {
     /// See `PayPalController.resource`.
     public let resource: String
     
+    /// See `PayPalController.version`.
+    public let version: Version
+    
     /// See `PayPalController.init(container:)`.
     public init(container: Container) {
         self.container = container
         self.resource = "activities"
+        self.version = try container.make(Configuration.self).version || .v1
     }
     
     /// Sends a request to the PayPal `GET /v{Configuration.version}/activities/activities` endpoint.
@@ -27,10 +31,9 @@ public final class Activities: PayPalController {
     ///
     /// - Parameter parameters: The querys string parameters to send in the request URL.
     /// - Returns: The endpoint's response, decoded to an `ActivitiesResponse` object, wrapped in a future.
-    public func activities(parameters: QueryParamaters = QueryParamaters()) -> Future<ActivitiesResponse> {
-        return Future.flatMap(on: self.container) { () -> Future<ActivitiesResponse> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.get(self.path() + "activities", parameters: parameters)
+    public func activities(parameters: QueryParamaters = QueryParamaters()) -> Future<Activity.Response> {
+        return self.client { client in
+            return client.get(self.path + "activities", parameters: parameters)
         }
     }
 }
diff --git a/Sources/PayPal/API/Controllers/BillingAgreements.swift b/Sources/PayPal/API/Controllers/BillingAgreements.swift
index 5a73384d..325d3915 100644
--- a/Sources/PayPal/API/Controllers/BillingAgreements.swift
+++ b/Sources/PayPal/API/Controllers/BillingAgreements.swift
@@ -21,10 +21,14 @@ public final class BillingAgreements: PayPalController {
     /// See `PayPalController.resource` for more information.
     public let resource: String
     
+    /// See `PayPalController.version`.
+    public let version: Version
+    
     /// See `PayPalController.init(container:)`.
     public init(container: Container) {
         self.container = container
         self.resource = "payments//billing-agreements"
+        self.version = try container.make(Configuration.self).version || .v1
     }
     
     /// Creates a billing agreement.
@@ -39,9 +43,8 @@ public final class BillingAgreements: PayPalController {
     /// - Returns: The billing agreement that was created, wrapped in a future. If an error occured
     ///   while creating the agreement, that is wrapped in the future instead.
     public func create(with agreement: NewAgreement) -> Future<BillingAgreement> {
-        return Future.flatMap(on: container) { () -> Future<BillingAgreement> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.post(self.path(), body: agreement, as: BillingAgreement.self)
+        return self.client { client in
+            return client.post(self.path, body: agreement, as: BillingAgreement.self)
         }
     }
     
@@ -56,9 +59,8 @@ public final class BillingAgreements: PayPalController {
     /// - Returns: The HTTP status code of the response, which will be 200. If an error was returned in the
     ///   response, it will get conveted to a Swift error and be returned in the future instead.
     public func update(agreement id: String, with patches: [Patch]) -> Future<HTTPStatus> {
-        return Future.flatMap(on: self.container) { () -> Future<HTTPStatus> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.patch(self.path() + id, body: ["patch_request": patches], as: HTTPStatus.self)
+        return self.client { client in
+            return client.patch(self.path + id, body: ["patch_request": patches], as: HTTPStatus.self)
         }
     }
     
@@ -73,9 +75,8 @@ public final class BillingAgreements: PayPalController {
     ///   If an error is returned in the response, it is converted to a Swift error
     ///   and is tha value that the future wraps instead.
     public func get(agreement id: String) -> Future<BillingAgreement> {
-        return Future.flatMap(on: self.container) { () -> Future<BillingAgreement> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.get(self.path() + id, as: BillingAgreement.self)
+        return self.client { client in
+            return client.get(self.path + id, as: BillingAgreement.self)
         }
     }
     
@@ -91,13 +92,11 @@ public final class BillingAgreements: PayPalController {
     /// - Returns: The HTTP status code of the response, which will be 204. If an error was returned in the
     ///   response, it will get conveted to a Swift error and be returned in the future instead.
     public func billBalance(for agreementID: String, reason: String?) -> Future<HTTPStatus> {
-        return Future.flatMap(on: self.container) { () -> Future<HTTPStatus> in
+        return self.client { client in
             guard reason?.count ?? 0 <= 128 else {
                 throw PayPalError(status: .badRequest, identifier: "invalidLength", reason: "`note` property must have a length of 128 or less")
             }
-            
-            let client = try self.container.make(PayPalClient.self)
-            return try client.post(self.path() + agreementID + "/bill-balance", body: ["note": reason], as: HTTPStatus.self)
+            return client.post(self.path + agreementID + "/bill-balance", body: ["note": reason], as: HTTPStatus.self)
         }
     }
     
@@ -113,13 +112,11 @@ public final class BillingAgreements: PayPalController {
     /// - Returns: The HTTP status code of the response, which will be 204. If an error was returned in the
     ///   response, it will get conveted to a Swift error and be returned in the future instead.
     public func cancel(agreement id: String, reason: String?) -> Future<HTTPStatus> {
-        return Future.flatMap(on: self.container) { () -> Future<HTTPStatus> in
+        return self.client { client in
             guard reason?.count ?? 0 <= 128 else {
                 throw PayPalError(status: .badRequest, identifier: "invalidLength", reason: "`note` property must have a length of 128 or less")
             }
-            
-            let client = try self.container.make(PayPalClient.self)
-            return try client.post(self.path() + id + "/cancel", body: ["note": reason], as: HTTPStatus.self)
+            return client.post(self.path + id + "/cancel", body: ["note": reason], as: HTTPStatus.self)
         }
     }
     
@@ -135,13 +132,12 @@ public final class BillingAgreements: PayPalController {
     /// - Returns: The HTTP status code of the API response, which will be `204`. If an error was returned in the
     ///   response, it will get conveted to a Swift error and be returned in the future instead.
     public func reactivate(agreement id: String, reason: String?) -> Future<HTTPStatus> {
-        return Future.flatMap(on: self.container) { () -> Future<HTTPStatus> in
+        return self.client { client in
             guard reason?.count ?? 0 <= 128 else {
                 throw PayPalError(status: .badRequest, identifier: "invalidLength", reason: "`note` property must have a length of 128 or less")
             }
             
-            let client = try self.container.make(PayPalClient.self)
-            return try client.post(self.path() + id + "/re-activate", body: ["note": reason], as: HTTPStatus.self)
+            return client.post(self.path + id + "/re-activate", body: ["note": reason], as: HTTPStatus.self)
         }
     }
     
@@ -155,10 +151,9 @@ public final class BillingAgreements: PayPalController {
     ///
     /// - Returns: The HTTP status code of the API response, which will be `204`. If an error was returned in the
     ///   response, it will get conveted to a Swift error and be returned in the future instead.
-    public func setBalance(for agreementID: String, amount: Money) -> Future<HTTPStatus> {
-        return Future.flatMap(on: self.container) { () -> Future<HTTPStatus> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.post(self.path() + agreementID + "/set-balance", body: amount, as: HTTPStatus.self)
+    public func setBalance(for agreementID: String, amount: CurrencyCodeAmount) -> Future<HTTPStatus> {
+        return self.client { client in
+            return client.post(self.path + agreementID + "/set-balance", body: amount, as: HTTPStatus.self)
         }
     }
     
@@ -173,13 +168,11 @@ public final class BillingAgreements: PayPalController {
     /// - Returns: The HTTP status code of the API response, which will be `204`. If an error was returned in the
     ///   response, it will get conveted to a Swift error and be returned in the future instead.
     public func suspend(agreement id: String, reason: String?) -> Future<HTTPStatus> {
-        return Future.flatMap(on: self.container) { () -> Future<HTTPStatus> in
+        return self.client { client in
             guard reason?.count ?? 0 <= 128 else {
                 throw PayPalError(status: .badRequest, identifier: "invalidLength", reason: "`note` property must have a length of 128 or less")
             }
-            
-            let client = try self.container.make(PayPalClient.self)
-            return try client.post(self.path() + id + "/suspend", body: ["note": reason], as: HTTPStatus.self)
+            return client.post(self.path + id + "/suspend", body: ["note": reason], as: HTTPStatus.self)
         }
     }
     
@@ -196,9 +189,8 @@ public final class BillingAgreements: PayPalController {
     /// - Returns: An array of transactions for the billing agreement within the time periods set in the query paramaters.
     ///   If an error was found in the response, it is converted to a Swift error and that is what the future wraps instead.
     public func transactions(for agreementID: String, parameters: QueryParamaters = QueryParamaters()) -> Future<[Transaction]> {
-        return Future.flatMap(on: self.container) { () -> Future<[Transaction]> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.get(self.path() + agreementID + "/transactions", parameters: parameters, as: [Transaction].self)
+        return self.client { client in
+            return client.get(self.path + agreementID + "/transactions", parameters: parameters, as: [Transaction].self)
         }
     }
     
@@ -211,9 +203,8 @@ public final class BillingAgreements: PayPalController {
     /// - Returns: The billing agreement object that was executed wrapped in a future.
     ///   If an error was found in the response, it is converted to a Swift error and that is what the future wraps instead.
     public func execute(agreement id: String) -> Future<BillingAgreement> {
-        return Future.flatMap(on: self.container) { () -> Future<BillingAgreement> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.post(self.path() + id + "/agreement-execute", as: BillingAgreement.self)
+        return self.client { client in
+            return client.post(self.path + id + "/agreement-execute", as: BillingAgreement.self)
         }
     }
 }
diff --git a/Sources/PayPal/API/Controllers/BillingPlans.swift b/Sources/PayPal/API/Controllers/BillingPlans.swift
index ae990ff4..814dc786 100644
--- a/Sources/PayPal/API/Controllers/BillingPlans.swift
+++ b/Sources/PayPal/API/Controllers/BillingPlans.swift
@@ -26,10 +26,14 @@ public final class BillingPlans: PayPalController {
     /// See `PayPalController.resource` for more information.
     public let resource: String
     
+    /// See `PayPalController.version`.
+    public let version: Version
+    
     /// See `PayPalController.init(container:)`.
     public init(container: Container) {
         self.container = container
         self.resource = "payments/billing-plans"
+        self.version = try container.make(Configuration.self).version || .v1
     }
     
     
@@ -46,11 +50,9 @@ public final class BillingPlans: PayPalController {
     /// - Returns: The created billing plan wrapped in a future. If an error response was sent back instead, it gets converted
     ///   to a Swift error and the future wraps that instead.
     public func create(with plan: BillingPlan) -> Future<BillingPlan> {
-        return Future.flatMap(on: self.container) { () -> Future<BillingPlan> in
+        return self.client { client in
             guard plan.type != nil else { throw PayPalError(identifier: "nilValue", reason: "BillingPlan `type` value must not be `nil`.") }
-            
-            let client = try self.container.make(PayPalClient.self)
-            return try client.post(self.path(), body: plan, as: BillingPlan.self)
+            return client.post(self.path, body: plan, as: BillingPlan.self)
         }
     }
     
@@ -65,9 +67,8 @@ public final class BillingPlans: PayPalController {
     ///
     /// - Returns: A list of the billing plans wrapped in a future. If an error response was sent back instead, it gets converted
     ///   to a Swift error and the future wraps that instead.
-    public func list(state: BillingPlan.State? = nil, parameters: QueryParamaters = QueryParamaters()) -> Future<BillingPlanList> {
-        return Future.flatMap(on: self.container) { () -> Future<BillingPlanList> in
-            let client = try self.container.make(PayPalClient.self)
+    public func list(state: BillingPlan.State? = nil, parameters: QueryParamaters = QueryParamaters()) -> Future<BillingPlan.List> {
+        return self.client { client in
             var params = parameters
             
             if let state = state, params.custom == nil {
@@ -75,7 +76,7 @@ public final class BillingPlans: PayPalController {
             } else {
                 params.custom?["status"] = state?.rawValue
             }
-            return try client.get(self.path(), parameters: params, as: BillingPlanList.self)
+            return client.get(self.path, parameters: params, as: BillingPlan.List.self)
         }
     }
     
@@ -91,9 +92,8 @@ public final class BillingPlans: PayPalController {
     /// - Returns: The HTTP status of the response, in this case `200 OK`. If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func update(plan id: String, patches: [Patch]) -> Future<HTTPStatus> {
-        return Future.flatMap(on: self.container) { () -> Future<HTTPStatus> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.patch(self.path() + id, body: patches, as: HTTPStatus.self)
+        return self.client { client in
+            return client.patch(self.path + id, body: patches, as: HTTPStatus.self)
         }
     }
     
@@ -106,9 +106,8 @@ public final class BillingPlans: PayPalController {
     /// - Returns: The billing plan for the ID passed in, wrapped in a future. If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func details(plan id: String) -> Future<BillingPlan> {
-        return Future.flatMap(on: self.container) { () -> Future<BillingPlan> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.get(self.path() + id, as: BillingPlan.self)
+        return self.client { client in
+            return client.get(self.path + id, as: BillingPlan.self)
         }
     }
     
@@ -124,8 +123,6 @@ public final class BillingPlans: PayPalController {
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func setState(of planID: String, to state: BillingPlan.State) -> Future<HTTPStatus> {
         let newValue = JSON.object(["state": .string(state.rawValue)])
-        return self.update(plan: planID, patches: [
-            Patch(operation: .replace, path: "/", value: newValue)
-        ])
+        return self.update(plan: planID, patches: [ Patch(operation: .replace, path: "/", value: newValue) ])
     }
 }
diff --git a/Sources/PayPal/API/Controllers/CustomerDisputes.swift b/Sources/PayPal/API/Controllers/CustomerDisputes.swift
index 6bbcf543..b7627b41 100644
--- a/Sources/PayPal/API/Controllers/CustomerDisputes.swift
+++ b/Sources/PayPal/API/Controllers/CustomerDisputes.swift
@@ -32,10 +32,14 @@ public final class CustomerDisputes: PayPalController {
     /// See `PayPalController.resource` for more information.
     public let resource: String
     
+    /// See `PayPalController.version`.
+    public let version: Version
+    
     /// See `PayPalController.init(container:)`.
     public init(container: Container) {
         self.container = container
         self.resource = "customer/disputes"
+        self.version = try container.make(Configuration.self).version || .v1
     }
     
     
@@ -71,9 +75,8 @@ public final class CustomerDisputes: PayPalController {
     /// - Returns: A list of customer disputes wrapped in a future. If an error response was sent back instead, it gets converted
     ///   to a Swift error and the future wraps that instead.
     public func list(parameters: QueryParamaters = QueryParamaters()) -> Future<CustomerDisputeList> {
-        return Future.flatMap(on: self.container) { () -> Future<CustomerDisputeList> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.get(self.path(), parameters: parameters, as: CustomerDisputeList.self)
+        return self.client { client in
+            return client.get(self.path, parameters: parameters, as: CustomerDisputeList.self)
         }
     }
     
@@ -87,9 +90,8 @@ public final class CustomerDisputes: PayPalController {
     /// - Returns: A customer dispute wrapped in a future. If an error response was sent back instead, it gets converted
     ///   to a Swift error and the future wraps that instead.
     public func details(for disputeID: String) -> Future<CustomerDispute> {
-        return Future.flatMap(on: self.container) { () -> Future<CustomerDispute> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.get(self.path() + disputeID, as: CustomerDispute.self)
+        return self.client { client in
+            return client.get(self.path + disputeID, as: CustomerDispute.self)
         }
     }
     
@@ -105,9 +107,8 @@ public final class CustomerDisputes: PayPalController {
     /// - Returns: An array containing a link to the dispute wrapped in a future. If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func accept(claim disputeID: String, with body: AcceptDisputeBody) -> Future<[LinkDescription]> {
-        return Future.flatMap(on: self.container) { () -> Future<[LinkDescription]> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.post(self.path() + disputeID + "/accept-claim", body: body, as: LinkResponse.self)["links", []]
+        return self.client { client in
+            return client.post(self.path + disputeID + "/accept-claim", body: body, as: LinkResponse.self)["links", []]
         }
     }
     
@@ -129,9 +130,8 @@ public final class CustomerDisputes: PayPalController {
         guard try self.container.make(Configuration.self).environment == .sandbox else {
             throw Abort(.internalServerError, reason: "Dispute settlement endpoint only availible in sandbox environment.")
         }
-        return Future.flatMap(on: self.container) { () -> Future<[LinkDescription]> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.post(self.path() + id + "/adjudicate", body: ["adjudication_outcome": outcome], as: LinkResponse.self)["links", []]
+        return self.client { client in
+            return client.post(self.path + id + "/adjudicate", body: ["adjudication_outcome": outcome], as: LinkResponse.self)["links", []]
         }
     }
     
@@ -150,9 +150,8 @@ public final class CustomerDisputes: PayPalController {
     /// - Returns: An array of request-related [HATEOAS links](https://developer.paypal.com/docs/api/overview/#hateoas-links).
     ///   If an error response was sent back instead, it gets converted to a Swift error and the future wraps that instead.
     public func appeal(dispute id: String, evidence: [Evidence]) -> Future<[LinkDescription]> {
-        return Future.flatMap(on: self.container) { () -> Future<[LinkDescription]> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.post(self.path() + id + "/appeal", body: evidence, as: LinkResponse.self)["links", []]
+        return self.client { client in
+            return client.post(self.path + id + "/appeal", body: evidence, as: LinkResponse.self)["links", []]
         }
     }
     
@@ -167,13 +166,11 @@ public final class CustomerDisputes: PayPalController {
     /// - Returns: An array of request-related [HATEOAS links](https://developer.paypal.com/docs/api/overview/#hateoas-links).
     ///   If an error response was sent back instead, it gets converted to a Swift error and the future wraps that instead.
     public func escalate(dispute id: String, note: String) -> Future<[LinkDescription]> {
-        return Future.flatMap(on: self.container) { () -> Future<[LinkDescription]> in
+        return self.client { client in
             guard note.count >= 1 && note.count <= 2000 else {
                 throw PayPalError(status: .badRequest, identifier: "invalidLength", reason: "`note` property must have a length between 0 and 2000")
             }
-            
-            let client = try self.container.make(PayPalClient.self)
-            return try client.post(self.path() + id + "/escalate", body: ["note": note], as: LinkResponse.self)["links", []]
+            return client.post(self.path + id + "/escalate", body: ["note": note], as: LinkResponse.self)["links", []]
         }
     }
     
@@ -189,9 +186,8 @@ public final class CustomerDisputes: PayPalController {
     /// - Returns: An array of request-related [HATEOAS links](https://developer.paypal.com/docs/api/overview/#hateoas-links).
     ///   If an error response was sent back instead, it gets converted to a Swift error and the future wraps that instead.
     public func offerResolution(for disputeID: String, offer: CustomerDispute.ResolutionOffer) -> Future<[LinkDescription]> {
-        return Future.flatMap(on: self.container) { () -> Future<[LinkDescription]> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.post(self.path() + disputeID + "/make-offer", body: offer, as: LinkResponse.self)["links", []]
+        return self.client { client in
+            return client.post(self.path + disputeID + "/make-offer", body: offer, as: LinkResponse.self)["links", []]
         }
     }
     
@@ -226,7 +222,7 @@ public final class CustomerDisputes: PayPalController {
             let json = try MultipartPart(data: JSONEncoder().encode(evidences), headers: ["Content-Type": "application/json"])
             let body: [String: MultipartPartConvertible] = ["input": json, "file1": file]
             
-            let request: Request = try self.container.paypal(.POST, self.path() + disputeID + "/provide-evidence", body: nil as [Int]?)
+            let request: Request = try self.container.paypal(.POST, self.path + disputeID + "/provide-evidence", body: nil as [Int]?)
             try request.content.encode(body.parts(), as: .related)
             
             let response = try self.container.client().send(request)
@@ -268,9 +264,8 @@ public final class CustomerDisputes: PayPalController {
         guard try self.container.make(Configuration.self).environment == .sandbox else {
             throw Abort(.internalServerError, reason: "Dispute settlement endpoint only availible in sandbox environment.")
         }
-        return Future.flatMap(on: self.container) { () -> Future<[LinkDescription]> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.post(self.path() + disputeID + "/require-evidence", body: ["action": action], as: LinkResponse.self)["links", []]
+        return self.client { client in
+            return client.post(self.path + disputeID + "/require-evidence", body: ["action": action], as: LinkResponse.self)["links", []]
         }
     }
     
@@ -285,9 +280,8 @@ public final class CustomerDisputes: PayPalController {
     /// - Returns: An array of request-related [HATEOAS links](https://developer.paypal.com/docs/api/overview/#hateoas-links).
     ///   If an error response was sent back instead, it gets converted to a Swift error and the future wraps that instead.
     public func message(dispute id: String, content: String) -> Future<[LinkDescription]> {
-        return Future.flatMap(on: self.container) { () -> Future<[LinkDescription]> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.post(self.path() + id + "/send-message", body: ["message": content], as: LinkResponse.self)["links", []]
+        return self.client { client in
+            return client.post(self.path + id + "/send-message", body: ["message": content], as: LinkResponse.self)["links", []]
         }
     }
 }
diff --git a/Sources/PayPal/API/Controllers/Identity.swift b/Sources/PayPal/API/Controllers/Identity.swift
index a0f9fa55..7c05ea7e 100644
--- a/Sources/PayPal/API/Controllers/Identity.swift
+++ b/Sources/PayPal/API/Controllers/Identity.swift
@@ -15,10 +15,14 @@ public final class Identity: PayPalController {
     /// See `PayPalController.resource` for more information.
     public let resource: String
     
+    /// See `PayPalController.version`.
+    public let version: Version
+    
     /// See `PayPalController.init(container:)`.
     public init(container: Container) {
         self.container = container
         self.resource = "identity"
+        self.version = try container.make(Configuration.self).version || .v1
     }
     
     /// Retrieves the authenticated user's profile attributes.
@@ -26,9 +30,8 @@ public final class Identity: PayPalController {
     /// - Returns: A `UserInfo` object, containing user profile attributes. The attributes returned depend on the scopes configured for the REST app.
     ///   For example, if the `address` scope is not configured for the app, the response does not include the `address` attribute.
     public func info() -> Future<UserInfo> {
-        return Future.flatMap(on: self.container) { () -> Future<UserInfo> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.get(self.path() + "openidconnect/userinfo", parameters: QueryParamaters(custom: ["schema": "openid"]), as: UserInfo.self)
+        return self.client { client in
+            return client.get(self.path + "openidconnect/userinfo", parameters: QueryParamaters(custom: ["schema": "openid"]), as: UserInfo.self)
         }
     }
 }
diff --git a/Sources/PayPal/API/Controllers/Invoices.swift b/Sources/PayPal/API/Controllers/Invoices.swift
index cbb2bf2e..17e15bbc 100644
--- a/Sources/PayPal/API/Controllers/Invoices.swift
+++ b/Sources/PayPal/API/Controllers/Invoices.swift
@@ -13,10 +13,14 @@ public class Invoices: PayPalController {
     /// See `PayPalController.resource` for more information.
     public let resource: String
     
+    /// See `PayPalController.version`.
+    public let version: Version
+    
     /// See `PayPalController.init(container:)`.
     public required init(container: Container) {
         self.container = container
         self.resource = "invoicing/invoices"
+        self.version = try container.make(Configuration.self).version || .v1
     }
     
     /// Creates a draft invoice. To move the invoice from a draft to payable state,
@@ -32,9 +36,8 @@ public class Invoices: PayPalController {
     ///
     /// - Returns: The saved Invoice. If an error response was sent back instead, it gets converted to a Swift error and the future wraps that instead.
     public func create(invoice: Invoice) -> Future<Invoice> {
-        return Future.flatMap(on: self.container) { () -> EventLoopFuture<Invoice> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.post(self.path(), body: invoice, as: Invoice.self)
+        return self.client { client in
+            return client.post(self.path, body: invoice, as: Invoice.self)
         }
     }
     
@@ -48,9 +51,8 @@ public class Invoices: PayPalController {
     /// - Returns: The list of invoices that match the query parameters passed in. If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func list(parameters: QueryParamaters = QueryParamaters()) -> Future<InvoiceList> {
-        return Future.flatMap(on: self.container) { () -> EventLoopFuture<InvoiceList> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.get(self.path(), parameters: parameters, as: InvoiceList.self)
+        return self.client { client in
+            return client.get(self.path, parameters: parameters, as: InvoiceList.self)
         }
     }
     
@@ -65,9 +67,8 @@ public class Invoices: PayPalController {
     ///
     /// - Returns: The updated invoice object. If an error response was sent back instead, it gets converted to a Swift error and the future wraps that instead.
     public func update(invoice id: String, with body: Invoice, notifyMerchant notify: Bool = true) -> Future<Invoice> {
-        return Future.flatMap(on: self.container) { () -> EventLoopFuture<Invoice> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.put(self.path() + id, parameters: QueryParamaters(custom: ["notify_merchant": notify.description]), body: body, as: Invoice.self)
+        return self.client { client in
+            return client.put(self.path + id, parameters: QueryParamaters(custom: ["notify_merchant": notify.description]), body: body, as: Invoice.self)
         }
     }
     
@@ -80,9 +81,8 @@ public class Invoices: PayPalController {
     /// - Returns: The invoice data for the ID passed in. If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func details(for invoiceID: String) -> Future<Invoice> {
-        return Future.flatMap(on: self.container) { () -> Future<Invoice> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.get(self.path() + invoiceID, as: Invoice.self)
+        return self.client { client in
+            return client.get(self.path + invoiceID, as: Invoice.self)
         }
     }
     
@@ -97,9 +97,8 @@ public class Invoices: PayPalController {
     /// - Returns: The HTTP status of the response, which will be 204 (No Content). If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func deleteDraft(invoice id: String) -> Future<HTTPStatus> {
-        return Future.flatMap(on: self.container) { () -> Future<HTTPStatus> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.delete(self.path() + id, as: HTTPStatus.self)
+        return self.client { client in
+            return client.delete(self.path + id, as: HTTPStatus.self)
         }
     }
     
@@ -112,9 +111,8 @@ public class Invoices: PayPalController {
     /// - Returns: The HTTP status of the response, which will be 204 (No Content). If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func cancel(invoice id: String) -> Future<HTTPStatus> {
-        return Future.flatMap(on: self.container) { () -> Future<HTTPStatus> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.post(self.path() + id + "/cancel", as: HTTPStatus.self)
+        return self.client { client in
+            return client.post(self.path + id + "/cancel", as: HTTPStatus.self)
         }
     }
     
@@ -129,9 +127,8 @@ public class Invoices: PayPalController {
     /// - Returns: The HTTP status of the response, which will be 204 (No Content). If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func delete(payment: String, forInvoice invoice: String) -> Future<HTTPStatus> {
-        return Future.flatMap(on: self.container) { () -> Future<HTTPStatus> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.delete(self.path() + invoice + "/payment-records/" + payment, as: HTTPStatus.self)
+        return self.client { client in
+            return client.delete(self.path + invoice + "/payment-records/" + payment, as: HTTPStatus.self)
         }
     }
     
@@ -152,15 +149,13 @@ public class Invoices: PayPalController {
     /// - Returns: The base64-encoded image of the `image/png` type. If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func generateQR(for invoiceID: String, width: Int = 500, height: Int = 500) -> Future<String> {
-        return Future.flatMap(on: self.container) { () -> Future<String> in
+        return self.client { client in
             guard (150...500).contains(width) && (150...500).contains(height) else {
                 throw Abort(.internalServerError, reason: "Height and width values for QR code must be between 150 and 500")
             }
-            
-            let client = try self.container.make(PayPalClient.self)
             let parameters = QueryParamaters(custom: ["width": width.description, "height": height.description])
             
-            return try client.get(self.path() + invoiceID + "/qr-code", parameters: parameters, as: [String: String].self)["image"].unwrap(
+            return client.get(self.path + invoiceID + "/qr-code", parameters: parameters, as: [String: String].self)["image"].unwrap(
                 or: Abort(.failedDependency, reason: "`image` key not found in PayPal response")
             )
         }
@@ -177,9 +172,8 @@ public class Invoices: PayPalController {
     /// - Returns: The HTTP status of the response, which will be 200 (OK). If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func pay(invoice id: String, payment: Invoice.Payment) -> Future<HTTPStatus> {
-        return Future.flatMap(on: self.container) { () -> Future<HTTPStatus> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.post(self.path() + id + "/record-payment", body: payment, as: HTTPStatus.self)
+        return self.client { client in
+            return client.post(self.path + id + "/record-payment", body: payment, as: HTTPStatus.self)
         }
     }
     
@@ -194,9 +188,8 @@ public class Invoices: PayPalController {
     /// - Returns: The HTTP status of the response, which will be 200 (OK). If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func refund(invoice id: String, payment: Invoice.Payment) -> Future<HTTPStatus> {
-        return Future.flatMap(on: self.container) { () -> Future<HTTPStatus> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.post(self.path() + id + "/record-refund", body: payment, as: HTTPStatus.self)
+        return self.client { client in
+            return client.post(self.path + id + "/record-refund", body: payment, as: HTTPStatus.self)
         }
     }
     
@@ -211,9 +204,8 @@ public class Invoices: PayPalController {
     /// - Returns: The HTTP status of the response, which will be 204 (No Content). If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func delete(refund: String, forInvoice invoice: String) -> Future<HTTPStatus> {
-        return Future.flatMap(on: self.container) { () -> Future<HTTPStatus> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.delete(self.path() + invoice + "/refund-records/" + refund, as: HTTPStatus.self)
+        return self.client { client in
+            return client.delete(self.path + invoice + "/refund-records/" + refund, as: HTTPStatus.self)
         }
     }
     
@@ -229,9 +221,8 @@ public class Invoices: PayPalController {
     /// - Returns: The HTTP status of the response, which will be 202 (Accepted). If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func remind(invoice id: String, with reminder: Invoice.Reminder) -> Future<HTTPStatus> {
-        return Future.flatMap(on: self.container) { () -> Future<HTTPStatus> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.post(self.path() + id + "/remind", body: reminder, as: HTTPStatus.self)
+        return self.client { client in
+            return client.post(self.path + id + "/remind", body: reminder, as: HTTPStatus.self)
         }
     }
     
@@ -250,9 +241,8 @@ public class Invoices: PayPalController {
     /// - Returns: An array containing a link to the dispute wrapped in a future. If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func schedule(invoice id: String) -> Future<[LinkDescription]> {
-        return Future.flatMap(on: self.container) { () -> Future<[LinkDescription]> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.post(self.path() + id + "/schedule", as: LinkResponse.self)["links", []]
+        return self.client { client in
+            return client.post(self.path + id + "/schedule", as: LinkResponse.self)["links", []]
         }
     }
     
@@ -269,11 +259,10 @@ public class Invoices: PayPalController {
     /// - Returns: The HTTP status of the response, which will be 202 (Accepted). If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func send(invoice id: String, notifyMerchant notify: Bool = true) -> Future<HTTPStatus> {
-        return Future.flatMap(on: self.container) { () -> Future<HTTPStatus> in
-            let client = try self.container.make(PayPalClient.self)
+        return self.client { client in
             let parameters = QueryParamaters(custom: ["notify_merchant": notify.description])
             
-            return try client.post(self.path() + id + "/send", parameters: parameters, as: HTTPStatus.self)
+            return client.post(self.path + id + "/send", parameters: parameters, as: HTTPStatus.self)
         }
     }
     
@@ -285,9 +274,8 @@ public class Invoices: PayPalController {
     /// - Returns: The new invoice number, incremented from the last number. If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func nextNumber() -> Future<String> {
-        return Future.flatMap(on: self.container) { () -> Future<String> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.post(self.path(), as: [String: String].self)["number"].unwrap(
+        return self.client { client in
+            return client.post(self.path, as: [String: String].self)["number"].unwrap(
                 or: Abort(.failedDependency, reason: "`number` key not found in PayPal response")
             )
         }
@@ -302,10 +290,9 @@ public class Invoices: PayPalController {
     /// - Returns: The list of invoices that match the search criteria passed in, wrapped in a future. If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func search(with body: Invoice.Search) -> Future<InvoiceList> {
-        return  Future.flatMap(on: self.container) { () -> Future<InvoiceList> in
-            let client = try self.container.make(PayPalClient.self)
+        return self.client { client in
             let config = try self.container.make(Configuration.self)
-            let path = "v" + config.version + "/invoicing/search"
+            let path = "v" + config.version.rawValue + "/invoicing/search"
             
             return client.post(path, body: body, as: InvoiceList.self)
         }
diff --git a/Sources/PayPal/API/Controllers/ManagedAccounts.swift b/Sources/PayPal/API/Controllers/ManagedAccounts.swift
index 2bfa92a4..c787af67 100644
--- a/Sources/PayPal/API/Controllers/ManagedAccounts.swift
+++ b/Sources/PayPal/API/Controllers/ManagedAccounts.swift
@@ -27,10 +27,14 @@ public final class ManagedAccounts: PayPalController {
     /// See `PayPalController.resource` for more information.
     public let resource: String
     
+    /// See `PayPalController.version`.
+    public let version: Version
+    
     /// See `PayPalController.init(container:)`.
     public init(container: Container) {
         self.container = container
         self.resource = "partners/merchant-accounts"
+        self.version = try container.make(Configuration.self).version || .v1
     }
     
     /// Creates a merchant account. Submit the merchant account information in the JSON request body.
@@ -42,9 +46,8 @@ public final class ManagedAccounts: PayPalController {
     /// - Returns: Creation success information, wrapped in a future. If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func create(account: MerchantAccount) -> Future<CreatedMerchantResponse> {
-        return Future.flatMap(on: self.container) { () -> Future<CreatedMerchantResponse> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.post(self.path(), body: account, as: CreatedMerchantResponse.self)
+        return self.client { client in
+            return client.post(self.path, body: account, as: CreatedMerchantResponse.self)
         }
     }
     
@@ -61,9 +64,8 @@ public final class ManagedAccounts: PayPalController {
     /// - Returns: The HTTP status code of the response, which will be `204 No Content`. If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func patch(account id: String, with patchs: [Patch]) -> Future<HTTPStatus> {
-        return Future.flatMap(on: self.container) { () -> Future<HTTPStatus> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.patch(self.path() + id, body: ["patch_request": patchs], as: HTTPStatus.self)
+        return self.client { client in
+            return client.patch(self.path + id, body: ["patch_request": patchs], as: HTTPStatus.self)
         }
     }
     
@@ -78,9 +80,8 @@ public final class ManagedAccounts: PayPalController {
     /// - Returns: The HTTP status code of the response, which will be `204 No Content`. If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func update(account id: String, with data: MerchantAccount) -> Future<HTTPStatus> {
-        return Future.flatMap(on: self.container) { () -> Future<HTTPStatus> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.put(self.path() + id, body: data, as: HTTPStatus.self)
+        return self.client { client in
+            return client.put(self.path + id, body: data, as: HTTPStatus.self)
         }
     }
     
@@ -93,9 +94,8 @@ public final class ManagedAccounts: PayPalController {
     /// - Returns: The data for the merchant account, wrapped in a future. If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func details(for accountID: String) -> Future<MerchantAccount> {
-        return Future.flatMap(on: self.container) { () -> Future<MerchantAccount> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.get(self.path() + accountID, as: MerchantAccount.self)
+        return self.client { client in
+            return client.get(self.path + accountID, as: MerchantAccount.self)
         }
     }
     
@@ -108,9 +108,8 @@ public final class ManagedAccounts: PayPalController {
     /// - Returns: The balance of the account of the ID passed in, wrapped in a future. If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func balance(for accountID: String) -> Future<BalanceResponse> {
-        return Future.flatMap(on: self.container) { () -> Future<BalanceResponse> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.get(self.path() + accountID + "/balances", as: BalanceResponse.self)
+        return self.client { client in
+            return client.get(self.path + accountID + "/balances", as: BalanceResponse.self)
         }
     }
     
@@ -123,9 +122,8 @@ public final class ManagedAccounts: PayPalController {
     /// - Returns: The details of the account's financial instruments, wrapped in a future. If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func financialInstruments(for accountID: String) -> Future<FinancialInstruments> {
-        return Future.flatMap(on: self.container) { () -> Future<FinancialInstruments> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.get(self.path() + accountID + "/financial-instruments", as: FinancialInstruments.self)
+        return self.client { client in
+            return client.get(self.path + accountID + "/financial-instruments", as: FinancialInstruments.self)
         }
     }
 }
diff --git a/Sources/PayPal/API/Controllers/Orders.swift b/Sources/PayPal/API/Controllers/Orders.swift
index 43690cc2..750f9134 100644
--- a/Sources/PayPal/API/Controllers/Orders.swift
+++ b/Sources/PayPal/API/Controllers/Orders.swift
@@ -15,10 +15,14 @@ public final class Orders: PayPalController {
     /// See `PayPalController.resource` for more information.
     public let resource: String
     
+    /// See `PayPalController.version`.
+    public let version: Version
+    
     /// See `PayPalController.init(container:)`.
     public init(container: Container) {
         self.container = container
         self.resource = "checkout/orders"
+        self.version = try container.make(Configuration.self).version || .v1
     }
     
     /// Creates an order.
@@ -33,18 +37,17 @@ public final class Orders: PayPalController {
     /// - Returns: The new order created by PayPal, wrapped in a future. If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func create(order: Order, partnerID id: String?) -> Future<Order> {
-        return Future.flatMap(on: self.container) { () -> Future<Order> in
-            let client = try self.container.make(PayPalClient.self)
-            let headers: HTTPHeaders = id == nil ? [:] : ["PayPal-Partner-Attribution-Id": id!]
+        return self.client { client in
+            let headers: HTTPHeaders = id == nil ? [:] : [HTTPHeaderName.paypalAttribution.description: id!]
             
             if order.units == nil || order.redirects == nil {
                 var order = order
                 if order.units == nil { order.units = [] }
                 if order.redirects == nil { order.redirects = Redirects(return: nil, cancel: nil) }
                 
-                return try client.post(self.path(), headers: headers, body: order, as: Order.self)
+                return client.post(self.path, headers: headers, body: order, as: Order.self)
             } else {
-                return try client.post(self.path(), headers: headers, body: order, as: Order.self)
+                return client.post(self.path, headers: headers, body: order, as: Order.self)
             }
         }
     }
@@ -60,9 +63,8 @@ public final class Orders: PayPalController {
     /// - Returns: An HTTP status, which will be `204 No Content`, wrapped in a future. If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func cancel(order id: String) -> Future<HTTPStatus> {
-        return Future.flatMap(on: self.container) { () -> Future<HTTPStatus> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.delete(self.path() + id, as: HTTPStatus.self)
+        return self.client { client in
+            return client.delete(self.path + id, as: HTTPStatus.self)
         }
     }
     
@@ -76,9 +78,8 @@ public final class Orders: PayPalController {
     /// - Returns: The order for the ID passed in, wrapped in a future. If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func details(for orderID: String) -> Future<Order> {
-        return Future.flatMap(on: self.container) { () -> Future<Order> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.get(self.path() + orderID, as: Order.self)
+        return self.client { client in
+            return client.get(self.path + orderID, as: Order.self)
         }
     }
     
@@ -101,18 +102,17 @@ public final class Orders: PayPalController {
     /// - Returns: The order the payment is made for, wrapped in a future. If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func pay(order id: String, with body: Order.PaymentRequest, partner partnerID: String? = nil, request requestID: String? = nil) -> Future<Order> {
-        return Future.flatMap(on: self.container) { () -> Future<Order> in
-            let client = try self.container.make(PayPalClient.self)
+        return self.client { client in
             var headers: HTTPHeaders = [:]
             
             if let partner = partnerID {
-                headers.add(name: "PayPal-Partner-Attribution-Id", value: partner)
+                headers.add(name: .paypalAttribution, value: partner)
             }
             if let request = requestID {
-                headers.add(name: "PayPal-Request-Id", value: request)
+                headers.add(name: .paypalRequest, value: request)
             }
             
-            return try client.post(self.path() + id + "/pay", headers: headers, body: body, as: Order.self)
+            return client.post(self.path + id + "/pay", headers: headers, body: body, as: Order.self)
         }
     }
 }
diff --git a/Sources/PayPal/API/Controllers/Payments.swift b/Sources/PayPal/API/Controllers/Payments.swift
index b6ed6f60..64127abb 100644
--- a/Sources/PayPal/API/Controllers/Payments.swift
+++ b/Sources/PayPal/API/Controllers/Payments.swift
@@ -53,10 +53,14 @@ public final class Payments: PayPalController {
     /// See `PayPalController.resource` for more information.
     public let resource: String
     
+    /// See `PayPalController.version`.
+    public let version: Version
+    
     /// See `PayPalController.init(container:)`.
     public init(container: Container) {
         self.container = container
         self.resource = "payments"
+        self.version = try container.make(Configuration.self).version || .v1
     }
     
     // MARK: - /payment
@@ -85,11 +89,10 @@ public final class Payments: PayPalController {
     /// - Returns: The payment that was created, wrapped in a future. If PayPal returns an error response instead,
     ///   it will get converted to a Swift error and the future will wrap that.
     public func create(payment: Payment, partner: String? = nil) -> Future<Payment> {
-        return Future.flatMap(on: self.container) { () -> Future<Payment> in
-            let client = try self.container.make(PayPalClient.self)
+        return self.client { client in
             let headers: HTTPHeaders = partner == nil ? [:] : ["PayPal-Partner-Attribution-Id": partner!]
             
-            return try client.post(self.path(for: .payment), headers: headers, body: payment, as: Payment.self)
+            return client.post(self.path(for: .payment), headers: headers, body: payment, as: Payment.self)
         }
     }
     
@@ -111,13 +114,11 @@ public final class Payments: PayPalController {
     ///   range of payments and the ID of the element to use to get the next range of results. If PayPal returns an error response,
     ///   it will get converted to a Swift error and the future will wrap that instead.
     public func list(parameters: QueryParamaters = QueryParamaters()) -> Future<PaymentList> {
-        return Future.flatMap(on: self.container) { () -> Future<PaymentList> in
+        return self.client { client in
             guard parameters.count ?? 0 <= 20 else {
                 throw PayPalError(status: .internalServerError, identifier: "invalidCount", reason: "`count` query paramater must be 20 or less")
             }
-            
-            let client = try self.container.make(PayPalClient.self)
-            return try client.get(self.path(for: .payment), parameters: parameters, as: PaymentList.self)
+            return client.get(self.path(for: .payment), parameters: parameters, as: PaymentList.self)
         }
     }
     
@@ -136,9 +137,8 @@ public final class Payments: PayPalController {
     /// - Returns: The payment that was updated, wrapped in a future. If PayPal returns an error response,
     ///   it will get converted to a Swift error and the future will wrap that instead.
     public func patch(payment id: String, with patches: [Patch]) -> Future<Payment> {
-        return Future.flatMap(on: self.container) { () -> EventLoopFuture<Payment> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.patch(self.path(for: .payment) + id, body: patches, as: Payment.self)
+        return self.client { client in
+            return client.patch(self.path(for: .payment) + id, body: patches, as: Payment.self)
         }
     }
     
@@ -151,9 +151,8 @@ public final class Payments: PayPalController {
     /// - Returns: The payment for the ID passed in. If PayPal returns an error response,
     ///   it will get converted to a Swift error and the future will wrap that instead.
     public func get(payment id: String) -> Future<Payment> {
-        return Future.flatMap(on: self.container) { () -> Future<Payment> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.get(self.path(for: .payment) + id, as: Payment.self)
+        return self.client { client in
+            return client.get(self.path(for: .payment) + id, as: Payment.self)
         }
     }
     
@@ -170,18 +169,17 @@ public final class Payments: PayPalController {
     /// - Returns: The payment model that was executed, wrapped in a future. If PayPal returns an error response,
     ///   it will get converted to a Swift error and the future will wrap that instead.
     public func execute(payment id: String, with executor: Payment.Executor, request: String? = nil, partner: String? = nil) -> Future<Payment> {
-        return Future.flatMap(on: self.container) { () -> Future<Payment> in
-            let client = try self.container.make(PayPalClient.self)
+        return self.client { client in
             var headers: HTTPHeaders = [:]
             
             if let request = request {
-                headers.add(name: "PayPal-Request-Id", value: request)
+                headers.add(name: .paypalRequest, value: request)
             }
             if let partner = partner {
-                headers.add(name: "PayPal-Partner-Attribution-Id", value: partner)
+                headers.add(name: .paypalAttribution, value: partner)
             }
             
-            return try client.post(self.path(for: .payment) + id + "/execute", headers: headers, body: executor, as: Payment.self)
+            return client.post(self.path(for: .payment) + id + "/execute", headers: headers, body: executor, as: Payment.self)
         }
     }
     
@@ -196,9 +194,8 @@ public final class Payments: PayPalController {
     /// - Returns: The sale object for the ID passed in, wrapped in a future. If PayPal returns an error response,
     ///   it will get converted to a Swift error and the future will wrap that instead.
     public func get(sale id: String) -> Future<RelatedResource.Sale> {
-        return Future.flatMap(on: self.container) { () -> Future<RelatedResource.Sale> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.get(self.path(for: .sale) + id, as: RelatedResource.Sale.self)
+        return self.client { client in
+            return client.get(self.path(for: .sale) + id, as: RelatedResource.Sale.self)
         }
     }
     
@@ -215,11 +212,10 @@ public final class Payments: PayPalController {
     /// - Returns: The details of the refund, wrapped in a future. If PayPal returns an error response,
     ///   it will get converted to a Swift error and the future will wrap that instead.
     public func refund(sale id: String, with refund: Payment.Refund, request: String? = nil) -> Future<Payment.RefundResult> {
-        return Future.flatMap(on: self.container) { () -> Future<Payment.RefundResult> in
-            let client = try self.container.make(PayPalClient.self)
-            let headers: HTTPHeaders = request == nil ? [:] : ["PayPal-Request-Id": request!]
+        return self.client { client in
+            let headers: HTTPHeaders = request == nil ? [:] : [HTTPHeaderName.paypalRequest.description: request!]
             
-            return try client.post(self.path(for: .sale) + id + "/refund", headers: headers, body: refund, as: Payment.RefundResult.self)
+            return client.post(self.path(for: .sale) + id + "/refund", headers: headers, body: refund, as: Payment.RefundResult.self)
         }
     }
     
@@ -234,9 +230,8 @@ public final class Payments: PayPalController {
     /// - Returns: The authorization for the ID passed in, wrapped in a future. If PayPal returns an error response,
     ///   it will get converted to a Swift error and the future will wrap that instead.
     public func get(authorization id: String) -> Future<RelatedResource.Authorization> {
-        return Future.flatMap(on: self.container) { () -> Future<RelatedResource.Authorization> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.get(self.path(for: .authorization) + id, as: RelatedResource.Authorization.self)
+        return self.client { client in
+            return client.get(self.path(for: .authorization) + id, as: RelatedResource.Authorization.self)
         }
     }
     
@@ -251,9 +246,8 @@ public final class Payments: PayPalController {
     /// - Returns: The captured authorization, wrapped in a future. If PayPal returns an error response,
     ///   it will get converted to a Swift error and the future will wrap that instead.
     public func capture(authorization id: String, with capture: RelatedResource.Capture) -> Future<RelatedResource.Authorization> {
-        return Future.flatMap(on: self.container) { () -> Future<RelatedResource.Authorization> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.post(self.path(for: .authorization) + id + "/capture", body: capture, as: RelatedResource.Authorization.self)
+        return self.client { client in
+            return client.post(self.path(for: .authorization) + id + "/capture", body: capture, as: RelatedResource.Authorization.self)
         }
     }
     
@@ -275,9 +269,8 @@ public final class Payments: PayPalController {
     /// - Returns: The re-authorized authorization, wrapped in a future. If PayPal returns an error response,
     ///   it will get converted to a Swift error and the future will wrap that instead.
     public func reauthorize(authorization id: String, with authorization: RelatedResource.Authorization) -> Future<RelatedResource.Authorization> {
-        return Future.flatMap(on: self.container) { () -> Future<RelatedResource.Authorization> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.post(self.path(for: .authorization) + id + "/reauthorize", body: authorization, as: RelatedResource.Authorization.self)
+        return self.client { client in
+            return client.post(self.path(for: .authorization) + id + "/reauthorize", body: authorization, as: RelatedResource.Authorization.self)
         }
     }
     
@@ -292,11 +285,10 @@ public final class Payments: PayPalController {
     /// - Returns: The voided authorization, wrapped in a future. If PayPal returns an error response,
     ///   it will get converted to a Swift error and the future will wrap that instead.
     public func void(authorization id: String, request: String? = nil) -> Future<RelatedResource.Authorization> {
-        return Future.flatMap(on: self.container) { () -> Future<RelatedResource.Authorization> in
-            let client = try self.container.make(PayPalClient.self)
-            let headers: HTTPHeaders = request == nil ? [:] : ["PayPal-Request-Id": request!]
+        return self.client { client in
+            let headers: HTTPHeaders = request == nil ? [:] : [HTTPHeaderName.paypalRequest.description: request!]
             
-            return try client.post(self.path(for: .authorization) + id + "/void", headers: headers, as: RelatedResource.Authorization.self)
+            return client.post(self.path(for: .authorization) + id + "/void", headers: headers, as: RelatedResource.Authorization.self)
         }
     }
     
@@ -311,9 +303,8 @@ public final class Payments: PayPalController {
     /// - Returns: The order details for the ID, wrapped in a future. If PayPal returns an error response,
     ///   it will get converted to a Swift error and the future will wrap that instead.
     public func get(order id: String) -> Future<RelatedResource.Sale> {
-        return Future.flatMap(on: self.container) { () -> Future<RelatedResource.Sale> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.get(self.path(for: .orders) + id, as: RelatedResource.Sale.self)
+        return self.client { client in
+            return client.get(self.path(for: .orders) + id, as: RelatedResource.Sale.self)
         }
     }
     
@@ -330,9 +321,8 @@ public final class Payments: PayPalController {
     /// - Returns:The authorized order, wrapped in a future. If PayPal returns an error response,
     ///   it will get converted to a Swift error and the future will wrap that instead.
     public func authorize(order id: String, with authorization: RelatedResource.Authorization) -> Future<RelatedResource.Order> {
-        return Future.flatMap(on: self.container) { () -> Future<RelatedResource.Order> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.post(self.path(for: .orders) + id + "/authorize", body: authorization, as: RelatedResource.Order.self)
+        return self.client { client in
+            return client.post(self.path(for: .orders) + id + "/authorize", body: authorization, as: RelatedResource.Order.self)
         }
     }
     
@@ -348,9 +338,8 @@ public final class Payments: PayPalController {
     /// - Returns: The captured order, wrapped in a future. If PayPal returns an error response,
     ///   it will get converted to a Swift error and the future will wrap that instead.
     public func capture(order id: String, with capture: RelatedResource.Capture) -> Future<RelatedResource.Order> {
-        return Future.flatMap(on: self.container) { () -> Future<RelatedResource.Order> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.post(self.path(for: .orders) + id + "/capture", body: capture, as: RelatedResource.Order.self)
+        return self.client { client in
+            return client.post(self.path(for: .orders) + id + "/capture", body: capture, as: RelatedResource.Order.self)
         }
     }
     
@@ -365,11 +354,10 @@ public final class Payments: PayPalController {
     /// - Returns: The voided order, wrapped in a future. If PayPal returns an error response,
     ///   it will get converted to a Swift error and the future will wrap that instead.
     public func void(order id: String, request: String? = nil) -> Future<RelatedResource.Order> {
-        return Future.flatMap(on: self.container) { () -> Future<RelatedResource.Order> in
-            let client = try self.container.make(PayPalClient.self)
-            let headers: HTTPHeaders = request == nil ? [:] : ["PayPal-Request-Id": request!]
+        return self.client { client in
+            let headers: HTTPHeaders = request == nil ? [:] : [HTTPHeaderName.paypalRequest.description: request!]
             
-            return try client.post(self.path(for: .orders) + id + "/do-void", headers: headers, as: RelatedResource.Order.self)
+            return client.post(self.path(for: .orders) + id + "/do-void", headers: headers, as: RelatedResource.Order.self)
         }
     }
     
@@ -384,9 +372,8 @@ public final class Payments: PayPalController {
     /// - Returns: The captured transaction, wrapped in a future. If PayPal returns an error response,
     ///   it will get converted to a Swift error and the future will wrap that instead.
     public func get(captured id: String) -> Future<RelatedResource.Capture> {
-        return Future.flatMap(on: self.container) { () -> Future<RelatedResource.Capture> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.get(self.path(for: .capture) + id, as: RelatedResource.Capture.self)
+        return self.client { client in
+            return client.get(self.path(for: .capture) + id, as: RelatedResource.Capture.self)
         }
     }
     
@@ -402,11 +389,10 @@ public final class Payments: PayPalController {
     /// - Returns: The refunded capture transaction, wrapped in a future. If PayPal returns an error response,
     ///   it will get converted to a Swift error and the future will wrap that instead.
     public func refund(captured id: String, with refund: Payment.Refund, request: String? = nil) -> Future<RelatedResource.Capture> {
-        return Future.flatMap(on: self.container) { () -> Future<RelatedResource.Capture> in
-            let client = try self.container.make(PayPalClient.self)
-            let headers: HTTPHeaders = request == nil ? [:] : ["PayPal-Request-Id": request!]
+        return self.client { client in
+            let headers: HTTPHeaders = request == nil ? [:] : [HTTPHeaderName.paypalRequest.description: request!]
             
-            return try client.post(self.path(for: .capture) + id + "/refund", headers: headers, body: refund, as: RelatedResource.Capture.self)
+            return client.post(self.path(for: .capture) + id + "/refund", headers: headers, body: refund, as: RelatedResource.Capture.self)
         }
     }
     
@@ -421,16 +407,15 @@ public final class Payments: PayPalController {
     /// - Returns: The refund details, wrapped in a future. If PayPal returns an error response,
     ///   it will get converted to a Swift error and the future will wrap that instead.
     public func get(refund id: String) -> Future<RelatedResource.Refund> {
-        return Future.flatMap(on: self.container) { () -> Future<RelatedResource.Refund> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.get(self.path(for: .refund) + id, as: RelatedResource.Refund.self)
+        return self.client { client in
+            return client.get(self.path(for: .refund) + id, as: RelatedResource.Refund.self)
         }
     }
     
     // MARK: - Internal Helpers
     
-    internal func path(for resource: Resource)throws -> String {
-        return try self.path() + resource.rawValue + "/"
+    internal func path(for resource: Resource) -> String {
+        return self.path + resource.rawValue + "/"
     }
     
     internal enum Resource: String {
diff --git a/Sources/PayPal/API/Controllers/Templates.swift b/Sources/PayPal/API/Controllers/Templates.swift
index f7d4062d..6ed5f2cd 100644
--- a/Sources/PayPal/API/Controllers/Templates.swift
+++ b/Sources/PayPal/API/Controllers/Templates.swift
@@ -16,10 +16,14 @@ public final class Templates: PayPalController {
     /// See `PayPalController.resource` for more information.
     public let resource: String
     
+    /// See `PayPalController.version`.
+    public let version: Version
+    
     /// See `PayPalController.init(container:)`.
     public init(container: Container) {
         self.container = container
         self.resource = "invoicing/templates"
+        self.version = try container.make(Configuration.self).version || .v1
     }
     
     
@@ -35,9 +39,8 @@ public final class Templates: PayPalController {
     /// - Returns: The saved template object wrapped in a future. If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func create(template: Template) -> Future<Template> {
-        return Future.flatMap(on: self.container) { () -> Future<Template> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.post(self.path(), body: template, as: Template.self)
+        return self.client { client in
+            return client.post(self.path, body: template, as: Template.self)
         }
     }
     
@@ -53,12 +56,11 @@ public final class Templates: PayPalController {
     ///
     /// - Returns: The merchant's template details, wrapped in a future. If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
-    public func list(fields: Template.ListFields = .all) -> Future<TemplateList> {
-        return Future.flatMap(on: self.container) { () -> Future<TemplateList> in
-            let client = try self.container.make(PayPalClient.self)
+    public func list(fields: Template.ListFields = .all) -> Future<Template.List> {
+        return self.client { client in
             let parameters = QueryParamaters(custom: ["fields": fields.rawValue])
             
-            return try client.get(self.path(), parameters: parameters, as: TemplateList.self)
+            return client.get(self.path, parameters: parameters, as: Template.List.self)
         }
     }
     
@@ -73,9 +75,8 @@ public final class Templates: PayPalController {
     /// - Returns: The updated `Template` object, wrapped in a future. If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func update(template id: String, with data: Template) -> Future<Template> {
-        return Future.flatMap(on: self.container) { () -> Future<Template> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.put(self.path() + id, body: data, as: Template.self)
+        return self.client { client in
+            return client.put(self.path + id, body: data, as: Template.self)
         }
     }
     
@@ -88,9 +89,8 @@ public final class Templates: PayPalController {
     /// - Returns: The HTTP status of the response, which will be 204 (No Content), wrapped in a future. If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func delete(template id: String) -> Future<HTTPStatus> {
-        return Future.flatMap(on: self.container) { () -> Future<HTTPStatus> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.delete(self.path() + id, as: HTTPStatus.self)
+        return self.client { client in
+            return client.delete(self.path + id, as: HTTPStatus.self)
         }
     }
     
@@ -103,9 +103,8 @@ public final class Templates: PayPalController {
     /// - Returns: The `Template` object for the ID passed in, wrapped in a future. If an error response was sent back instead,
     ///   it gets converted to a Swift error and the future wraps that instead.
     public func details(for templateID: String) -> Future<Template> {
-        return Future.flatMap(on: self.container) { () -> Future<Template> in
-            let client = try self.container.make(PayPalClient.self)
-            return try client.get(self.path() + templateID, as: Template.self)
+        return self.client { client in
+            return client.get(self.path + templateID, as: Template.self)
         }
     }
 }
diff --git a/Sources/PayPal/Config/Provider.swift b/Sources/PayPal/Config/Provider.swift
index 1e1b6e0c..0d21d513 100644
--- a/Sources/PayPal/Config/Provider.swift
+++ b/Sources/PayPal/Config/Provider.swift
@@ -7,45 +7,30 @@ typealias Env = Vapor.Environment
 /// - `Configuration`
 /// - `AuthInfo`
 /// - `PayPalClient`
-///
-/// This provider needs 2 environment variables:
-///
-/// - `PAYPAL_CLIENT_ID`: Your PayPal dev client ID.
-/// - `PAYPAL_CLIENT_SECRET`: Your PayPal client secret.
 public final class PayPalProvider: Vapor.Provider {
     
-    let version: Float
+    let version: Version
+    let clientID: String
+    let clientSecret: String
     
     /// Creates a new `PayPal.Provider` instance to register with an
     /// application's `Services`.
     ///
     ///      try services.register(PayPal.Provider())
     ///
-    /// - Parameter version: The version of the PayPal API to use when making requests.
-    public init(version: Float = 1)throws {
-        let validVersions: [Float] = [1]
-        
-        guard validVersions.contains(version) else {
-            throw Abort(.internalServerError, reason: "API version \(version) is not supported.")
-        }
-        
+    /// - Parameters:
+    ///   - version: The version of the PayPal API to use when making requests.
+    ///   - id: The client ID for the PayPal app the connect to.
+    ///   - secret: The client secret for the PayPal app to connect to.
+    public init(version: Version = .v1, id: String, secret: String) {
         self.version = version
+        self.clientID = id
+        self.clientSecret = secret
     }
     
     /// Registers all services to the app's services.
     public func register(_ services: inout Services) throws {
-        guard let id = Env.get("PAYPAL_CLIENT_ID") else {
-            throw PayPalError(identifier: "envVarNotFound", reason: "Environment variable 'PAYPAL_CLIENT_ID' was not found")
-        }
-        guard let secret = Env.get("PAYPAL_CLIENT_SECRET") else {
-            throw PayPalError(identifier: "envVarNotFound", reason: "Environment variable 'PAYPAL_SECRET_ID' was not found")
-        }
-        
-        if Float(Int(self.version)) == self.version {
-            services.register(Configuration(id: id, secret: secret, version: String(describing: Int(self.version))))
-        } else {
-            services.register(Configuration(id: id, secret: secret, version: String(describing: self.version)))
-        }
+        services.register(Configuration(id: self.clientID, secret: self.clientSecret, version: self.version))
         
         services.register(AuthInfo())
         services.register(PayPalClient.self)
@@ -87,7 +72,7 @@ public final class Configuration: Service {
     public let secret: String
     
     /// The version of the PayPal API being used.
-    public let version: String
+    public let version: Version
     
     /// The PayPal environment to send requests to.
     /// This value is based on the app's current environment.
@@ -96,7 +81,7 @@ public final class Configuration: Service {
     /// be `.production`, otherwise it will be `.sandbox`.
     public internal(set) var environment: PayPal.Environment!
     
-    init(id: String, secret: String, version: String) {
+    init(id: String, secret: String, version: Version) {
         self.id = id
         self.secret = secret
         self.environment = nil
diff --git a/Sources/PayPal/Config/Versions.swift b/Sources/PayPal/Config/Versions.swift
new file mode 100644
index 00000000..0abdb22a
--- /dev/null
+++ b/Sources/PayPal/Config/Versions.swift
@@ -0,0 +1,6 @@
+/// The supported versions of the PayPal REST API.
+public enum Version: String, Hashable, CaseIterable, Codable {
+    
+    /// Version 1.
+    case v1 = "1"
+}
diff --git a/Sources/PayPal/Models/Account/AccountOwnerRelationship.swift b/Sources/PayPal/Models/Account/AccountOwnerRelationship.swift
index cfab749c..28cd1a7f 100644
--- a/Sources/PayPal/Models/Account/AccountOwnerRelationship.swift
+++ b/Sources/PayPal/Models/Account/AccountOwnerRelationship.swift
@@ -1,7 +1,7 @@
 import Vapor
 
 /// A family relationship of an account owner.
-public struct AccountOwnerRelationship: Content, ValidationSetable, Equatable {
+public struct AccountOwnerRelationship: Content, Equatable {
     
     /// The name of the familial relation.
     public var name: Name
@@ -10,48 +10,19 @@ public struct AccountOwnerRelationship: Content, ValidationSetable, Equatable {
     public var relation: String
     
     /// The country code for the nationality of the familial relation.
-    ///
-    /// This property can be set using the `AccountOwnerRelationship.set(_:)` method.
-    /// This method will validate the new value before assigning it to the property.
-    ///
-    /// Length: 2. Pattern: `^([A-Z]{2}|C2)$`.
-    public private(set) var country: String
+    public var country: Country
     
     
     /// Creates a new `AccountOwnerRelationship` instance.
     ///
-    ///     AccountOwnerRelationship(name: Name(prefix: nil, given: "Abe", surname: "Lincon", middle: nil, suffix: nil, full: "Abe Lincon"), country: "US")
-    public init(name: Name, country: String)throws {
+    ///     AccountOwnerRelationship(
+    ///         name: Name(prefix: nil, given: "Abe", surname: "Lincon", middle: nil, suffix: nil, full: "Abe Lincon"),
+    ///         country: .unitedStates
+    ///     )
+    public init(name: Name, country: Country)throws {
         self.name = name
         self.country = country
         self.relation = "MOTHER"
-        
-        try self.set(\.country <~ country)
-    }
-    
-    /// See [`Decodable.init(from:)`](https://developer.apple.com/documentation/swift/decodable/2894081-init).
-    public init(from decoder: Decoder)throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        let country = try container.decode(String.self, forKey: .country)
-        
-        self.country = country
-        self.name = try container.decode(Name.self, forKey: .name)
-        self.relation = try container.decode(String.self, forKey: .relation)
-        
-        try self.set(\.country <~ country)
-    }
-    
-    /// See `ValidationSetable.setterValidations()`.
-    public func setterValidations() -> SetterValidations<AccountOwnerRelationship> {
-        var validations = SetterValidations(AccountOwnerRelationship.self)
-        
-        validations.set(\.country) { country in
-            guard country.range(of: "^([A-Z]{2}|C2)$", options: .regularExpression) != nil else {
-                throw PayPalError(status: .badRequest, identifier: "malformedString", reason: "`country` value must match RegEx pattern `^([A-Z]{2}|C2)$`")
-            }
-        }
-        
-        return validations
     }
     
     enum CodingKeys: String, CodingKey {
diff --git a/Sources/PayPal/Models/Account/Responses/BalanceResponse.swift b/Sources/PayPal/Models/Account/Responses/BalanceResponse.swift
index 8fec1315..abf2408f 100644
--- a/Sources/PayPal/Models/Account/Responses/BalanceResponse.swift
+++ b/Sources/PayPal/Models/Account/Responses/BalanceResponse.swift
@@ -9,10 +9,10 @@ public struct BalanceResponse: Content, Equatable {
     public let payer: String?
     
     /// This field contains the total available balances based on currency.
-    public var available: [Money]?
+    public var available: [CurrencyCodeAmount]?
     
     /// This field contains the total pending reversal balances based on currency.
-    public var pending: [Money]?
+    public var pending: [CurrencyCodeAmount]?
     
     enum CodingKeys: String, CodingKey {
         case payer = "payer_id"
diff --git a/Sources/PayPal/Models/Activity/Activity.swift b/Sources/PayPal/Models/Activity/Activity.swift
index 347f4ce5..b10f0ad2 100644
--- a/Sources/PayPal/Models/Activity/Activity.swift
+++ b/Sources/PayPal/Models/Activity/Activity.swift
@@ -25,16 +25,16 @@ public struct Activity: Content, Equatable {
     public var counterparty: CounterParty?
     
     /// The PayPal fees that are associated with this activity, in money format.
-    public var fee: Money?
+    public var fee: CurrencyCodeAmount?
     
     /// The amount for this activity before fees are applied.
-    public var gross: Money?
+    public var gross: CurrencyCodeAmount?
     
     /// The amount for this activity after fees are applied.
-    public var net: Money?
+    public var net: CurrencyCodeAmount?
     
     /// The partner fees, in money format.
-    public var partnerFee: Money?
+    public var partnerFee: CurrencyCodeAmount?
     
     /// The extension properties.
     public var extensions: Extensions?
@@ -47,10 +47,10 @@ public struct Activity: Content, Equatable {
         subtype: SubType?,
         status: Status?,
         counterparty: CounterParty?,
-        fee: Money?,
-        gross: Money?,
-        net: Money?,
-        partnerFee: Money?,
+        fee: CurrencyCodeAmount?,
+        gross: CurrencyCodeAmount?,
+        net: CurrencyCodeAmount?,
+        partnerFee: CurrencyCodeAmount?,
         extensions: Extensions?
     ) {
         self.id = id
@@ -66,22 +66,6 @@ public struct Activity: Content, Equatable {
         self.extensions = extensions
     }
     
-    /// Compares two `Activity` objects, checking all the stored properties for equality.
-    public static func == (lhs: Activity, rhs: Activity) -> Bool {
-        return
-            (lhs.id == rhs.id) &&
-            (lhs.timeCreated == rhs.timeCreated) &&
-            (lhs.type == rhs.type) &&
-            (lhs.subtype == rhs.subtype) &&
-            (lhs.status == rhs.status) &&
-            (lhs.counterparty == rhs.counterparty) &&
-            (lhs.fee == rhs.fee) &&
-            (lhs.gross == rhs.gross) &&
-            (lhs.net == rhs.net) &&
-            (lhs.partnerFee == rhs.partnerFee) &&
-            (lhs.extensions == rhs.extensions)
-    }
-    
     enum CodingKeys: String, CodingKey {
         case id, subtype, status, counterparty, fee, gross, net, extensions
         case timeCreated = "time_created"
diff --git a/Sources/PayPal/Models/Activity/ActivityClientResponses.swift b/Sources/PayPal/Models/Activity/ActivityClientResponses.swift
index e5ee5c43..dc8fd732 100644
--- a/Sources/PayPal/Models/Activity/ActivityClientResponses.swift
+++ b/Sources/PayPal/Models/Activity/ActivityClientResponses.swift
@@ -1,26 +1,23 @@
 import Vapor
 
-/// The response structure returned from the `GET /v1/activities/activities` endpoint
-/// and `Activities.activities(parameters:)` client method.
-public struct ActivitiesResponse: Content, Equatable {
+extension Activity {
     
-    /// A list of the financial activities for a user.
-    public var items: [Activity]?
-    
-    /// The [HATEOAS links](https://developer.paypal.com/docs/api/overview/#hateoas-links) related to the request.
-    public let links: [LinkDescription]?
-    
-    /// Creates a new `ActivitiesResponse` instance.
-    ///
-    ///     ActivitiesResponse(items: [], links: [])
-    public init(items: [Activity]?, links: [LinkDescription]?) {
-        self.items = items
-        self.links = links
-    }
-    
-    
-    /// Compares two `ActivitiesResponse` objects, checking `items` and `links` properties equality.
-    public static func == (lhs: ActivitiesResponse, rhs: ActivitiesResponse) -> Bool {
-        return (lhs.items == rhs.items) && (lhs.links == rhs.links)
+    /// The response structure returned from the `GET /v1/activities/activities` endpoint
+    /// and `Activities.activities(parameters:)` client method.
+    public struct Response: Content, Equatable {
+        
+        /// A list of the financial activities for a user.
+        public var items: [Activity]?
+        
+        /// The [HATEOAS links](https://developer.paypal.com/docs/api/overview/#hateoas-links) related to the request.
+        public let links: [LinkDescription]?
+        
+        /// Creates a new `ActivitiesResponse` instance.
+        ///
+        ///     ActivitiesResponse(items: [], links: [])
+        public init(items: [Activity]?, links: [LinkDescription]?) {
+            self.items = items
+            self.links = links
+        }
     }
 }
diff --git a/Sources/PayPal/Models/Activity/InvoiceProperties.swift b/Sources/PayPal/Models/Activity/InvoiceProperties.swift
index f385ecbc..e516a416 100644
--- a/Sources/PayPal/Models/Activity/InvoiceProperties.swift
+++ b/Sources/PayPal/Models/Activity/InvoiceProperties.swift
@@ -17,11 +17,6 @@ public struct InvoiceProperties: Content, Equatable {
         self.invoiceNumber = invoiceNumber
     }
     
-    /// Compares two `InvoiceProperties` objects, checking that the `role` and `invoiceNumber` properties are the same
-    public static func == (lhs: InvoiceProperties, rhs: InvoiceProperties) -> Bool {
-        return (lhs.role == rhs.role) && (lhs.invoiceNumber == rhs.invoiceNumber)
-    }
-    
     enum CodingKeys: String, CodingKey {
         case role
         case invoiceNumber = "invoice_number"
diff --git a/Sources/PayPal/Models/Activity/PaymentProperties.swift b/Sources/PayPal/Models/Activity/PaymentProperties.swift
index 248a2efc..931ecfd1 100644
--- a/Sources/PayPal/Models/Activity/PaymentProperties.swift
+++ b/Sources/PayPal/Models/Activity/PaymentProperties.swift
@@ -38,18 +38,6 @@ public struct PaymentProperties: Content, Equatable {
         self.invoiceNumber = invoiceNumber
     }
     
-    /// Compares two `PaymentProperties` objects, checking that the `creditDebitCode`, `buyerNotes`,
-    /// `billingAgreementID`, `externalSubType`, and `invoiceNumber` properties are the same
-    public static func == (lhs: PaymentProperties, rhs: PaymentProperties) -> Bool {
-        return
-            (lhs.creditDebitCode == rhs.creditDebitCode) &&
-            (lhs.buyerNotes == rhs.buyerNotes) &&
-            (lhs.orderID == rhs.orderID) &&
-            (lhs.billingAgreementID == rhs.billingAgreementID) &&
-            (lhs.externalSubType == rhs.externalSubType) &&
-            (lhs.invoiceNumber == rhs.invoiceNumber)
-    }
-    
     /// Defines what monitary transaction occured for a transaction.
     public enum ExternalSubType: String, Hashable, CaseIterable, Content {
         
diff --git a/Sources/PayPal/Models/Activity/RequestMoneyProperties.swift b/Sources/PayPal/Models/Activity/RequestMoneyProperties.swift
index a0d51a32..f6f375e0 100644
--- a/Sources/PayPal/Models/Activity/RequestMoneyProperties.swift
+++ b/Sources/PayPal/Models/Activity/RequestMoneyProperties.swift
@@ -16,9 +16,4 @@ public struct RoleObjectProperties: Content, Equatable {
     public init(role: Role?) {
         self.role = role
     }
-    
-    /// Compares two `RoleObjectProperties` objects, checking that the `role` properties are the same
-    public static func == (lhs: RoleObjectProperties, rhs: RoleObjectProperties) -> Bool {
-        return lhs.role == rhs.role
-    }
 }
diff --git a/Sources/PayPal/Models/Address/Address.swift b/Sources/PayPal/Models/Address/Address.swift
index a26733a7..44a9fbf9 100644
--- a/Sources/PayPal/Models/Address/Address.swift
+++ b/Sources/PayPal/Models/Address/Address.swift
@@ -1,6 +1,6 @@
 import Vapor
 
-public struct Address: Content, ValidationSetable, Equatable {
+public struct Address: Content, Equatable {
     
     /// The address normalization status. Returned only for payers from Brazil.
     public let normalization: Normalization?
@@ -32,16 +32,17 @@ public struct Address: Content, ValidationSetable, Equatable {
     /// [Thailand](https://developer.paypal.com/docs/integration/direct/rest/state-codes/#thailand),
     /// or [United States](https://developer.paypal.com/docs/integration/direct/rest/state-codes/#usa).
     /// Maximum length is 40 single-byte characters.
-    public private(set) var state: String?
+    public var state: Province?
     
-    /// The [two-character ISO 3166-1 code](https://developer.paypal.com/docs/integration/direct/rest/country-codes/) that identifies the country or region.
+    /// The [two-character ISO 3166-1 code](https://developer.paypal.com/docs/integration/direct/rest/country-codes/)
+    /// that identifies the country or region.
     ///
     /// The value must match the RegEx pattern `^([A-Z]{2}|C2)$`.
     ///
     /// - Note: The country code for Great Britain is `GB` and not `UK` as used in the top-level
     ///   domain names for that country. Use the `C2` country code for China worldwide for comparable
     ///   uncontrolled price (CUP) method, bank card, and cross-border transactions.
-    public private(set) var countryCode: String
+    public var country: Country
     
     /// The postal code, which is the zip code or equivalent.
     /// Typically required for countries with a postal code or an equivalent.
@@ -74,12 +75,12 @@ public struct Address: Content, ValidationSetable, Equatable {
         line1: String,
         line2: String?,
         city: String,
-        state: String?,
-        countryCode: String,
+        state: Province?,
+        country: Country,
         postalCode: String,
         phone: String?,
         type: String?
-    )throws {
+    ) {
         self.normalization = nil
         self.recipientName = recipientName
         self.defaultAddress = defaultAddress
@@ -87,84 +88,17 @@ public struct Address: Content, ValidationSetable, Equatable {
         self.line2 = line2
         self.city = city
         self.state = state
-        self.countryCode = countryCode
+        self.country = country
         self.postalCode = postalCode
         self.phone = phone
         self.type = type
-        
-        try self.set(\.state <~ state)
-        try self.set(\.countryCode <~ countryCode)
-        try self.set(\.phone <~ phone)
-    }
-    
-    /// Creates a new instance of `Address` from that data coontained
-    /// in a decoder. Validates the `state` and `countryCode` values passed in.
-    public init(from decoder: Decoder)throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        
-        self.normalization = try container.decodeIfPresent(Normalization.self, forKey: .normalization)
-        self.recipientName = try container.decodeIfPresent(String.self, forKey: .recipientName)
-        self.defaultAddress = try container.decodeIfPresent(Bool.self, forKey: .defaultAddress)
-        self.line1 = try container.decode(String.self, forKey: .line1)
-        self.line2 = try container.decodeIfPresent(String.self, forKey: .line2)
-        self.city = try container.decode(String.self, forKey: .city)
-        self.state = try container.decodeIfPresent(String.self, forKey: .state)
-        self.countryCode = try container.decode(String.self, forKey: .countryCode)
-        self.postalCode = try container.decode(String.self, forKey: .postalCode)
-        self.phone = try container.decodeIfPresent(String.self, forKey: .phone)
-        self.type = try container.decodeIfPresent(String.self, forKey: .type)
-        
-        try self.set(\.state <~ state)
-        try self.set(\.countryCode <~ countryCode)
-        try self.set(\.phone <~ phone)
-    }
-    
-    /// Compares two `Address` objects, checking properties for equality.
-    public static func == (lhs: Address, rhs: Address) -> Bool {
-        return
-            (lhs.recipientName == rhs.recipientName) &&
-            (lhs.defaultAddress == rhs.defaultAddress) &&
-            (lhs.line1 == rhs.line1) &&
-            (lhs.line2 == rhs.line2) &&
-            (lhs.city == rhs.city) &&
-            (lhs.state == rhs.state) &&
-            (lhs.countryCode == rhs.countryCode) &&
-            (lhs.postalCode == rhs.postalCode)
-    }
-    
-    public func setterValidations() -> SetterValidations<Address> {
-        var validations = SetterValidations(Address.self)
-        
-        validations.set(\.state) { state in
-            guard state?.count ?? 0 <= 40 else {
-                throw PayPalError(
-                    status: .badRequest,
-                    identifier: "malformedString",
-                    reason: "`ShippingAddress.state` property length can be no longer than 40 1-byte characters"
-                )
-            }
-        }
-        validations.set(\.countryCode) { code in
-            guard code.range(of: "^([A-Z]{2}|C2)$", options: .regularExpression) != nil else {
-                throw PayPalError(
-                    status: .badRequest,
-                    identifier: "malformedString",
-                    reason: "`ShippingAddress.countryCode` property must match `([A-Z]{2}|C2)$` RegEx pattern"
-                )
-            }
-        }
-        validations.set(\.phone) { phone in
-            
-        }
-        
-        return validations
     }
     
     enum CodingKeys: String, CodingKey {
         case line1, line2, city, state, phone, type
         case recipientName = "recipient_name"
         case defaultAddress = "default_address"
-        case countryCode = "country_code"
+        case country = "country_code"
         case postalCode = "postal_code"
         case normalization = "normalization_status"
     }
diff --git a/Sources/PayPal/Models/BillingAgreement/BillingPayment.swift b/Sources/PayPal/Models/BillingAgreement/BillingPayment.swift
index 64cccfe6..ec8ea612 100644
--- a/Sources/PayPal/Models/BillingAgreement/BillingPayment.swift
+++ b/Sources/PayPal/Models/BillingAgreement/BillingPayment.swift
@@ -1,7 +1,7 @@
 import Vapor
 
 /// The payment made during each cycle of a billing agreement.
-public struct BillingPayment<M>: Content, ValidationSetable, Equatable where M: Monitary {
+public struct BillingPayment<M>: Content, ValidationSetable, Equatable where M: Amount {
     
     /// The PayPal-generated ID for the resource.
     ///
diff --git a/Sources/PayPal/Models/BillingAgreement/Details.swift b/Sources/PayPal/Models/BillingAgreement/Details.swift
index 54a014c3..5d0ab4f8 100644
--- a/Sources/PayPal/Models/BillingAgreement/Details.swift
+++ b/Sources/PayPal/Models/BillingAgreement/Details.swift
@@ -5,7 +5,7 @@ import Vapor
 public struct Details: Content, Equatable {
     
     /// The currency and amount of the outstanding balance for this agreement.
-    public var outstanding: Money?
+    public var outstanding: CurrencyCodeAmount?
     
     /// The number of payment cycles remaining for this agreement.
     public var cyclesRemaining: String?
@@ -20,7 +20,7 @@ public struct Details: Content, Equatable {
     public var lastPaymentDate: String?
     
     /// The currency and amount of the last payment amount for this agreement.
-    public var lastPaymentAmount: Money?
+    public var lastPaymentAmount: CurrencyCodeAmount?
     
     /// The final payment date and time for this agreement.
     public var finalPaymentDate: String?
@@ -42,12 +42,12 @@ public struct Details: Content, Equatable {
     ///         failedPaymentCount: "5"
     ///     )
     public init(
-        outstanding: Money?,
+        outstanding: CurrencyCodeAmount?,
         cyclesRemaining: String?,
         cyclesComplete: String?,
         nextBilling: String?,
         lastPaymentDate: String?,
-        lastPaymentAmount: Money?,
+        lastPaymentAmount: CurrencyCodeAmount?,
         finalPaymentDate: String?,
         failedPaymentCount: String?
     ) {
diff --git a/Sources/PayPal/Models/BillingAgreement/OverrideChargeModel.swift b/Sources/PayPal/Models/BillingAgreement/OverrideChargeModel.swift
index 9eccf316..5b0f8dcd 100644
--- a/Sources/PayPal/Models/BillingAgreement/OverrideChargeModel.swift
+++ b/Sources/PayPal/Models/BillingAgreement/OverrideChargeModel.swift
@@ -7,19 +7,13 @@ public struct OverrideCharge: Content, Equatable {
     public var id: String
     
     /// The updated amount and currency for this charge model.
-    public var amount: Money
+    public var amount: CurrencyCodeAmount
     
     /// Creates a new `OverrideCharge` instance.
     ///
     ///     OverrideCharge(id: "4F64CB9E-C9B8-49E9-8217-83CDBB857534", amount: Money(currency: .usd, value: "99.99"))
-    public init(id: String, amount: Money) {
+    public init(id: String, amount: CurrencyCodeAmount) {
         self.id = id
         self.amount = amount
     }
-    
-    
-    /// Compares two `OverrideCharge` objects, checking the equality of the `id` and `amount` properties.
-    public static func == (lhs: OverrideCharge, rhs: OverrideCharge) -> Bool {
-        return (lhs.id == rhs.id) && (lhs.amount == rhs.amount)
-    }
 }
diff --git a/Sources/PayPal/Models/BillingAgreement/Requests/NewAgreement.swift b/Sources/PayPal/Models/BillingAgreement/Requests/NewAgreement.swift
index 8699457c..3b101417 100644
--- a/Sources/PayPal/Models/BillingAgreement/Requests/NewAgreement.swift
+++ b/Sources/PayPal/Models/BillingAgreement/Requests/NewAgreement.swift
@@ -45,7 +45,7 @@ public struct NewAgreement: Content, ValidationSetable, Equatable {
     /// the agreement uses the default merchant preferences from the plan. The merchant preferences include how much it costs to set up the agreement,
     /// the URLs where the customer can approve or cancel the agreement, the maximum number of allowed failed payment attempts, whether PayPal
     /// automatically bills the outstanding balance in the next billing cycle, and the action if the customer's initial payment fails.
-    public var overrideMerchantPreferances: MerchantPreferances<Money>?
+    public var overrideMerchantPreferances: MerchantPreferances<CurrencyCodeAmount>?
     
     /// An array of charge models to override the charge models in the plan. A charge model defines shipping fee and tax information.
     /// If you omit this parameter, the agreement uses the default shipping fee and tax information from the plan.
@@ -75,7 +75,7 @@ public struct NewAgreement: Content, ValidationSetable, Equatable {
         plan: ID,
         details: Details? = nil,
         shippingAddress: Address? = nil,
-        overrideMerchantPreferances: MerchantPreferances<Money>? = nil,
+        overrideMerchantPreferances: MerchantPreferances<CurrencyCodeAmount>? = nil,
         overrideChargeModels: [OverrideCharge]? = nil
     )throws {
         self.name = name
@@ -104,7 +104,7 @@ public struct NewAgreement: Content, ValidationSetable, Equatable {
         self.payer = try container.decode(Payer.self, forKey: .payer)
         self.details = try container.decodeIfPresent(Details.self, forKey: .details)
         self.shippingAddress = try container.decodeIfPresent(Address.self, forKey: .shippingAddress)
-        self.overrideMerchantPreferances = try container.decodeIfPresent(MerchantPreferances<Money>.self, forKey: .overrideMerchantPreferances)
+        self.overrideMerchantPreferances = try container.decodeIfPresent(MerchantPreferances<CurrencyCodeAmount>.self, forKey: .overrideMerchantPreferances)
         self.overrideChargeModels = try container.decodeIfPresent([OverrideCharge].self, forKey: .overrideChargeModels)
         
         try self.set(\.name <~ name)
diff --git a/Sources/PayPal/Models/BillingAgreement/Responses/BillingAgreement.swift b/Sources/PayPal/Models/BillingAgreement/Responses/BillingAgreement.swift
index 1ef682eb..fe1eb431 100644
--- a/Sources/PayPal/Models/BillingAgreement/Responses/BillingAgreement.swift
+++ b/Sources/PayPal/Models/BillingAgreement/Responses/BillingAgreement.swift
@@ -48,7 +48,7 @@ public struct BillingAgreement: Content, ValidationSetable, Equatable {
     /// the agreement uses the default merchant preferences from the plan. The merchant preferences include how much it costs to set up the agreement,
     /// the URLs where the customer can approve or cancel the agreement, the maximum number of allowed failed payment attempts, whether PayPal
     /// automatically bills the outstanding balance in the next billing cycle, and the action if the customer's initial payment fails.
-    public var overrideMerchantPreferances: MerchantPreferances<Money>?
+    public var overrideMerchantPreferances: MerchantPreferances<CurrencyCodeAmount>?
     
     /// An array of charge models to override the charge models in the plan. A charge model defines shipping fee and tax information.
     /// If you omit this parameter, the agreement uses the default shipping fee and tax information from the plan.
@@ -87,7 +87,7 @@ public struct BillingAgreement: Content, ValidationSetable, Equatable {
         details: Details?,
         payer: Payer?,
         shippingAddress: Address?,
-        overrideMerchantPreferances: MerchantPreferances<Money>?,
+        overrideMerchantPreferances: MerchantPreferances<CurrencyCodeAmount>?,
         overrideChargeModels: [OverrideCharge]?,
         plan: BillingPlan?
     )throws {
@@ -127,7 +127,7 @@ public struct BillingAgreement: Content, ValidationSetable, Equatable {
         self.details = try container.decodeIfPresent(Details.self, forKey: .details)
         self.payer = try container.decodeIfPresent(Payer.self, forKey: .payer)
         self.shippingAddress = try container.decodeIfPresent(Address.self, forKey: .shippingAddress)
-        self.overrideMerchantPreferances = try container.decodeIfPresent(MerchantPreferances<Money>.self, forKey: .overrideMerchantPreferances)
+        self.overrideMerchantPreferances = try container.decodeIfPresent(MerchantPreferances<CurrencyCodeAmount>.self, forKey: .overrideMerchantPreferances)
         self.overrideChargeModels = try container.decodeIfPresent([OverrideCharge].self, forKey: .overrideChargeModels)
         self.plan = try container.decodeIfPresent(BillingPlan.self, forKey: .plan)
         self.links = try container.decodeIfPresent([LinkDescription].self, forKey: .links)
diff --git a/Sources/PayPal/Models/BillingAgreement/Responses/Transaction.swift b/Sources/PayPal/Models/BillingAgreement/Responses/Transaction.swift
index 3b599ab1..0a04e217 100644
--- a/Sources/PayPal/Models/BillingAgreement/Responses/Transaction.swift
+++ b/Sources/PayPal/Models/BillingAgreement/Responses/Transaction.swift
@@ -26,20 +26,20 @@ public struct Transaction: Content, Equatable {
     public let timezone: String?
     
     /// The currency and amount of the transaction.
-    public var amount: Money
+    public var amount: CurrencyCodeAmount
     
     /// The currency and amount of the transaction fee.
-    public var fee: Money
+    public var fee: CurrencyCodeAmount
     
     /// The currency and amount of the transaction net amount.
-    public var net: Money
+    public var net: CurrencyCodeAmount
     
     /// Creates a new `Transaction` instance. Assigns values to the `amount`, `fee`, and `net` properties,
     /// all other properties are `nil`.
     ///
     /// You probably won't ever need this initializer. For the most part,
     /// `.init(from:)` decoder init should be all you need.
-    public init(amount: Money, fee: Money, net: Money) {
+    public init(amount: CurrencyCodeAmount, fee: CurrencyCodeAmount, net: CurrencyCodeAmount) {
         self.id = nil
         self.state = nil
         self.type = nil
diff --git a/Sources/PayPal/Models/BillingAgreement/Term.swift b/Sources/PayPal/Models/BillingAgreement/Term.swift
index a775f30d..071f3ac2 100644
--- a/Sources/PayPal/Models/BillingAgreement/Term.swift
+++ b/Sources/PayPal/Models/BillingAgreement/Term.swift
@@ -12,32 +12,31 @@ public final class Term: Content, Equatable {
     public var type: TermType
     
     /// The currency and amount of the maximum billing amount associated with this term.
-    public var maxAmount: Money
+    public var maxAmount: CurrencyCodeAmount
     
     /// The number of times that money can be pulled during this term.
     public var occurrences: String
     
     /// The amount range for this term.
-    public var amountRange: Money
+    public var amountRange: CurrencyCodeAmount
     
     /// Indicates whether the customer can edit the amount in this term.
     public var editable: String
     
     /// Creates a new `Term` instance.
     ///
-    ///     Term(
-    ///         type: .monthly,
-    ///         maxAmount: Money(currency: .usd, value: "14.99"),
-    ///         occurrences: "1",
-    ///         amountRange: Money(currency: .usd, value: "9.99"),
-    ///         editable: "FALSE"
-    ///     )
+    /// - Parameters:
+    ///   - type: The term type.
+    ///   - maxAmount: The currency and amount of the maximum billing amount associated with this term.
+    ///   - occurrences: The number of times that money can be pulled during this term.
+    ///   - amountRange: The amount range for this term.
+    ///   - editable: Indicates whether the customer can edit the amount in this term.
     public init(
         id: String? = nil,
         type: TermType,
-        maxAmount: Money,
+        maxAmount: CurrencyCodeAmount,
         occurrences: String,
-        amountRange: Money,
+        amountRange: CurrencyCodeAmount,
         editable: String
     )throws {
         guard id?.count ?? 0 < 128 else {
diff --git a/Sources/PayPal/Models/BillingPlan/BillingPlan.swift b/Sources/PayPal/Models/BillingPlan/BillingPlan.swift
index 450dfb49..2791c720 100644
--- a/Sources/PayPal/Models/BillingPlan/BillingPlan.swift
+++ b/Sources/PayPal/Models/BillingPlan/BillingPlan.swift
@@ -39,7 +39,7 @@ public struct BillingPlan: Content, ValidationSetable, Equatable {
     public let updated: Date?
     
     /// An array of payment definitions for this plan.
-    public var paymentDefinitions: [BillingPayment<Amount>]?
+    public var paymentDefinitions: [BillingPayment<CurrencyAmount>]?
     
     /// An array of terms for this plan.
     public let terms: [Term]?
@@ -50,7 +50,7 @@ public struct BillingPlan: Content, ValidationSetable, Equatable {
     /// customer can approve or cancel the agreement, the maximum number of allowed failed payment attempts,
     /// whether PayPal automatically bills the outstanding balance in the next billing cycle,
     /// and the action if the customer's initial payment fails.
-    public var preferances: MerchantPreferances<Amount>?
+    public var preferances: MerchantPreferances<CurrencyAmount>?
     
     /// The currency code for the plan.
     public let currency: Currency?
@@ -79,7 +79,7 @@ public struct BillingPlan: Content, ValidationSetable, Equatable {
     ///         preferances: nil
     ///     )
     public init(
-        name: String, description: String, type: BillingPlan.PlanType, payments: [BillingPayment<Amount>]?, preferances: MerchantPreferances<Amount>?
+        name: String, description: String, type: BillingPlan.PlanType, payments: [BillingPayment<CurrencyAmount>]?, preferances: MerchantPreferances<CurrencyAmount>?
     )throws {
         self.id = nil
         self.state = nil
@@ -119,7 +119,7 @@ public struct BillingPlan: Content, ValidationSetable, Equatable {
         self.updated = try container.decodeIfPresent(Date.self, forKey: .updated)
         self.paymentDefinitions = try container.decodeIfPresent([BillingPayment].self, forKey: .paymentDefinitions)
         self.terms = try container.decodeIfPresent([Term].self, forKey: .terms)
-        self.preferances = try container.decodeIfPresent(MerchantPreferances<Amount>.self, forKey: .preferances)
+        self.preferances = try container.decodeIfPresent(MerchantPreferances<CurrencyAmount>.self, forKey: .preferances)
         self.currency = try container.decodeIfPresent(Currency.self, forKey: .currency)
         self.links = try container.decodeIfPresent([LinkDescription].self, forKey: .links)
         
diff --git a/Sources/PayPal/Models/BillingPlan/BillingPlanList.swift b/Sources/PayPal/Models/BillingPlan/BillingPlanList.swift
index 0feef0de..46fd0151 100644
--- a/Sources/PayPal/Models/BillingPlan/BillingPlanList.swift
+++ b/Sources/PayPal/Models/BillingPlan/BillingPlanList.swift
@@ -1,39 +1,42 @@
 import Vapor
 
-/// The structure of the response object returned from the `GET /v1/payments/billing-plans`
-/// endpoint, or the `BillingPlans.list(paramaters:)` method.
-public struct BillingPlanList: Content, Equatable {
+extension BillingPlan {
     
-    /// The total number of plans in the list.
-    public let items: String?
-    
-    /// The total number of pages in the response. The `page_size` request value determines
-    /// how many plans appear on each page. The `total_items` and `page_size` request values
-    /// are used to calculate the total number of pages in the response.
-    public let pages: String?
-    
-    /// An array of request-related [HATEOAS links](https://developer.paypal.com/docs/api/overview/#hateoas-links).
-    public let links: [LinkDescription]?
-    
-    /// An array of plans.
-    public var plans: [BillingPlan]?
-    
-    
-    /// Creates a new `BillingPlanList` instance.
-    ///
-    /// You will most likley not need to use this iniializer;
-    /// rather, use the `init(from:)` decoder init.
-    public init(plans: [BillingPlan]) {
-        self.pages = nil
-        self.links = nil
+    /// The structure of the response object returned from the `GET /v1/payments/billing-plans`
+    /// endpoint, or the `BillingPlans.list(paramaters:)` method.
+    public struct List: Content, Equatable {
         
-        self.items = String(describing: plans.count)
-        self.plans = plans
-    }
-    
-    enum CodingKeys: String, CodingKey {
-        case plans, links
-        case items = "total_items"
-        case pages = "total_pages"
+        /// The total number of plans in the list.
+        public let items: String?
+        
+        /// The total number of pages in the response. The `page_size` request value determines
+        /// how many plans appear on each page. The `total_items` and `page_size` request values
+        /// are used to calculate the total number of pages in the response.
+        public let pages: String?
+        
+        /// An array of request-related [HATEOAS links](https://developer.paypal.com/docs/api/overview/#hateoas-links).
+        public let links: [LinkDescription]?
+        
+        /// An array of plans.
+        public var plans: [BillingPlan]?
+        
+        
+        /// Creates a new `BillingPlanList` instance.
+        ///
+        /// You will most likley not need to use this iniializer;
+        /// rather, use the `init(from:)` decoder init.
+        public init(plans: [BillingPlan]) {
+            self.pages = nil
+            self.links = nil
+            
+            self.items = String(describing: plans.count)
+            self.plans = plans
+        }
+        
+        enum CodingKeys: String, CodingKey {
+            case plans, links
+            case items = "total_items"
+            case pages = "total_pages"
+        }
     }
 }
diff --git a/Sources/PayPal/Models/Business/Business.swift b/Sources/PayPal/Models/Business/Business.swift
index 01d9e187..9e454b31 100644
--- a/Sources/PayPal/Models/Business/Business.swift
+++ b/Sources/PayPal/Models/Business/Business.swift
@@ -71,14 +71,12 @@ public struct Business: Content, ValidationSetable, Equatable {
     /// An array of merchant addresses.
     public var addresses: [Address]
     
-    /// The [two-character ISO 3166-1 code](https://developer.paypal.com/docs/integration/direct/rest/country-codes/) that identifies the country or region.
-    ///
-    /// This property can be set using the `Business.set(_:)` method.
-    /// This method validates the new value before assigning it to the property.
+    /// The [two-character ISO 3166-1 code](https://developer.paypal.com/docs/integration/direct/rest/country-codes/)
+    /// that identifies the country or region.
     ///
     /// - Note: The country code for Great Britain is GB and not UK as used in the top-level domain names for that country.
     ///   Use the C2 country code for China worldwide for comparable uncontrolled price (CUP) method, bank card, and cross-border transactions.
-    public private(set) var country: String?
+    public var country: Country?
     
     /// An array of business stakeholder information.
     public var stakeholders: [Stakeholder]?
@@ -116,7 +114,7 @@ public struct Business: Content, ValidationSetable, Equatable {
     ///             message: []
     ///         ),
     ///         addresses: [],
-    ///         country: "US",
+    ///         country: .unitedStates,
     ///         stakeholders: [],
     ///         designation: .init(title: "CTO", area: "Software Engineering")
     ///     )
@@ -137,7 +135,7 @@ public struct Business: Content, ValidationSetable, Equatable {
         sales: Sales?,
         customerService: CustomerService?,
         addresses: [Address],
-        country: String?,
+        country: Country?,
         stakeholders: [Stakeholder]?,
         designation: Designation?
     )throws {
@@ -188,7 +186,7 @@ public struct Business: Content, ValidationSetable, Equatable {
             sales: container.decodeIfPresent(Sales.self, forKey: .sales),
             customerService: container.decodeIfPresent(CustomerService.self, forKey: .customerService),
             addresses: container.decode([Address].self, forKey: .addresses),
-            country: container.decodeIfPresent(String.self, forKey: .country),
+            country: container.decodeIfPresent(Country.self, forKey: .country),
             stakeholders: container.decodeIfPresent([Stakeholder].self, forKey: .stakeholders),
             designation: container.decodeIfPresent(Designation.self, forKey: .designation)
         )
@@ -216,12 +214,6 @@ public struct Business: Content, ValidationSetable, Equatable {
                 throw PayPalError(status: .badRequest, identifier: "malformedString", reason: "`merchant_category` value must have a length of 4")
             }
         }
-        validations.set(\.country) { country in
-            guard let country = country else { return }
-            guard country.range(of: "^([A-Z]{2}|C2)$", options: .regularExpression) != nil else {
-                throw PayPalError(status: .badRequest, identifier: "malformedString", reason: "`country` value must match RegEx pattern `^([A-Z]{2}|C2)$`")
-            }
-        }
         
         return validations
     }
diff --git a/Sources/PayPal/Models/Business/BusinessOwner/BusinessOwner.swift b/Sources/PayPal/Models/Business/BusinessOwner/BusinessOwner.swift
index da418c16..75c129b1 100644
--- a/Sources/PayPal/Models/Business/BusinessOwner/BusinessOwner.swift
+++ b/Sources/PayPal/Models/Business/BusinessOwner/BusinessOwner.swift
@@ -21,11 +21,8 @@ public struct BusinessOwner: Content, ValidationSetable, Equatable {
     /// The [two-character IS0-3166-1 country code](https://developer.paypal.com/docs/integration/direct/rest/country-codes/)
     /// of the account holder's country of residence.
     ///
-    /// This property can be set using the `BusinessOwner.set(_:)` method.
-    /// This method validates the new value before assigning it to the property.
-    ///
     /// Length: 2. Pattern: `^([A-Z]{2}|C2)$`.
-    public private(set) var country: String
+    public var country: Country
     
     /// An array of addresses for the account holder.
     public var addresses: [Address]
@@ -71,7 +68,7 @@ public struct BusinessOwner: Content, ValidationSetable, Equatable {
         email: String,
         name: Name,
         relationships: [AccountOwnerRelationship]?,
-        country: String,
+        country: Country,
         addresses: [Address],
         birthdate: String?,
         language: Language?,
@@ -99,12 +96,11 @@ public struct BusinessOwner: Content, ValidationSetable, Equatable {
     public init(from decoder: Decoder)throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         let email = try container.decode(String.self, forKey: .email)
-        let country = try container.decode(String.self, forKey: .country)
         let birthdate = try container.decodeIfPresent(String.self, forKey: .birthdate)
         
         self.email = email
-        self.country = country
         self.birthdate = birthdate
+        self.country = try container.decode(Country.self, forKey: .country)
         self.name = try container.decode(Name.self, forKey: .name)
         self.relationships = try container.decodeIfPresent([AccountOwnerRelationship].self, forKey: .relationships)
         self.addresses = try container.decode([Address].self, forKey: .addresses)
@@ -114,7 +110,6 @@ public struct BusinessOwner: Content, ValidationSetable, Equatable {
         self.occupation = try container.decodeIfPresent(String.self, forKey: .occupation)
         
         try self.set(\.email <~ email)
-        try self.set(\.country <~ country)
         try self.set(\.birthdate <~ birthdate)
     }
     
@@ -127,11 +122,6 @@ public struct BusinessOwner: Content, ValidationSetable, Equatable {
                 throw PayPalError(status: .badRequest, identifier: "malformedString", reason: "`email` value must match the RegEx pattern `^.+@[^\"\\-].+$`")
             }
         }
-        validations.set(\.country) { country in
-            guard country.range(of: "^([A-Z]{2}|C2)$", options: .regularExpression) != nil else {
-                throw PayPalError(status: .badRequest, identifier: "malformedString", reason: "`country` value must match the RegEx pattern `^([A-Z]{2}|C2)$`")
-            }
-        }
         validations.set(\.birthdate) { birthdate in
             let pattern = "^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$"
             guard birthdate?.range(of: pattern, options: .regularExpression) != nil else {
diff --git a/Sources/PayPal/Models/Business/BusinessOwner/BusinessOwnerAddress.swift b/Sources/PayPal/Models/Business/BusinessOwner/BusinessOwnerAddress.swift
index 58259b4b..4641531e 100644
--- a/Sources/PayPal/Models/Business/BusinessOwner/BusinessOwnerAddress.swift
+++ b/Sources/PayPal/Models/Business/BusinessOwner/BusinessOwnerAddress.swift
@@ -61,16 +61,17 @@ extension BusinessOwner {
         /// [Thailand](https://developer.paypal.com/docs/integration/direct/rest/state-codes/#thailand),
         /// or [United States](https://developer.paypal.com/docs/integration/direct/rest/state-codes/#usa).
         /// Maximum length is 40 single-byte characters.
-        public var state: String?
+        public var state: Province?
         
-        /// The [two-character ISO 3166-1 code](https://developer.paypal.com/docs/integration/direct/rest/country-codes/) that identifies the country or region.
+        /// The [two-character ISO 3166-1 code](https://developer.paypal.com/docs/integration/direct/rest/country-codes/)
+        /// that identifies the country or region.
         ///
         /// The value must match the RegEx pattern `^([A-Z]{2}|C2)$`.
         ///
         /// - Note: The country code for Great Britain is `GB` and not `UK` as used in the top-level
         ///   domain names for that country. Use the `C2` country code for China worldwide for comparable
         ///   uncontrolled price (CUP) method, bank card, and cross-border transactions.
-        public var country: String
+        public var country: Country
         
         /// The postal code, which is the zip code or equivalent.
         /// Typically required for countries with a postal code or an equivalent.
@@ -98,8 +99,8 @@ extension BusinessOwner {
             line3: String?,
             suburb: String?,
             city: String,
-            state: String?,
-            country: String,
+            state: Province?,
+            country: Country,
             postalCode: String?
         )throws {
             self.type = type
@@ -117,38 +118,23 @@ extension BusinessOwner {
             try self.set(\.line3 <~ line3)
             try self.set(\.suburb <~ suburb)
             try self.set(\.city <~ city)
-            try self.set(\.state <~ state)
             try self.set(\.country <~ country)
         }
         
         /// See [`Decodable.init(from:)`](https://developer.apple.com/documentation/swift/decodable/2894081-init).
         public init(from decoder: Decoder)throws {
             let container = try decoder.container(keyedBy: CodingKeys.self)
-            let line1 = try container.decode(String.self, forKey: .line1)
-            let line2 = try container.decodeIfPresent(String.self, forKey: .line2)
-            let line3 = try container.decodeIfPresent(String.self, forKey: .line3)
-            let suburb = try container.decodeIfPresent(String.self, forKey: .suburb)
-            let city = try container.decode(String.self, forKey: .city)
-            let state = try container.decodeIfPresent(String.self, forKey: .state)
-            let country = try container.decode(String.self, forKey: .country)
-            
-            self.line1 = line1
-            self.line2 = line2
-            self.line3 = line3
-            self.suburb = suburb
-            self.city = city
-            self.state = state
-            self.country = country
-            self.type = try container.decode(AddressType.self, forKey: .type)
-            self.postalCode = try container.decodeIfPresent(String.self, forKey: .postalCode)
-            
-            try self.set(\.line1 <~ line1)
-            try self.set(\.line2 <~ line2)
-            try self.set(\.line3 <~ line3)
-            try self.set(\.suburb <~ suburb)
-            try self.set(\.city <~ city)
-            try self.set(\.state <~ state)
-            try self.set(\.country <~ country)
+            try self.init(
+                type: container.decode(AddressType.self, forKey: .type),
+                line1: container.decode(String.self, forKey: .line1),
+                line2: container.decodeIfPresent(String.self, forKey: .line2),
+                line3: container.decodeIfPresent(String.self, forKey: .line3),
+                suburb: container.decodeIfPresent(String.self, forKey: .suburb),
+                city: container.decode(String.self, forKey: .city),
+                state: container.decodeIfPresent(Province.self, forKey: .state),
+                country: container.decode(Country.self, forKey: .country),
+                postalCode: container.decodeIfPresent(String.self, forKey: .postalCode)
+            )
         }
         
         /// See `ValidationSetable.setterValidations()`
@@ -180,19 +166,6 @@ extension BusinessOwner {
                     throw PayPalError(status: .badRequest, identifier: "invalidLength", reason: "`city` property length can be no longer 120")
                 }
             }
-            validations.set(\.state) { state in
-                guard state?.count ?? 0 <= 40 else {
-                    throw PayPalError(
-                        status: .badRequest,
-                        identifier: "invalidLength", reason: "`state` property length can be no longer than 40 1-byte characters"
-                    )
-                }
-            }
-            validations.set(\.country) { code in
-                guard code.range(of: "^([A-Z]{2}|C2)$", options: .regularExpression) != nil else {
-                    throw PayPalError(status: .badRequest, identifier: "invalidLength", reason: "`country` property must match `([A-Z]{2}|C2)$` RegEx pattern")
-                }
-            }
             
             return validations
         }
diff --git a/Sources/PayPal/Models/Business/BusinessSales.swift b/Sources/PayPal/Models/Business/BusinessSales.swift
index b5a2686f..4ee8939c 100644
--- a/Sources/PayPal/Models/Business/BusinessSales.swift
+++ b/Sources/PayPal/Models/Business/BusinessSales.swift
@@ -6,10 +6,10 @@ extension Business {
     public struct Sales: Content, ValidationSetable, Equatable {
         
         /// The average transaction price.
-        public var price: MoneyRange<Amount>?
+        public var price: MoneyRange<CurrencyAmount>?
         
         /// The average volume of monthly sales.
-        public var volume: MoneyRange<Amount>?
+        public var volume: MoneyRange<CurrencyAmount>?
         
         /// An array of sales venues for the business.
         public var venues: [SalesVenue]?
@@ -35,7 +35,7 @@ extension Business {
         ///         website: "https://finiansbooksteacoffeeetc.com",
         ///         online: PercentRange(0...1)
         ///     )
-        public init(price: MoneyRange<Amount>?, volume: MoneyRange<Amount>?, venues: [SalesVenue]?, website: String?, online: PercentRange?)throws {
+        public init(price: MoneyRange<CurrencyAmount>?, volume: MoneyRange<CurrencyAmount>?, venues: [SalesVenue]?, website: String?, online: PercentRange?)throws {
             self.price = price
             self.volume = volume
             self.venues = venues
diff --git a/Sources/PayPal/Models/Business/Stakeholder/Stakeholder.swift b/Sources/PayPal/Models/Business/Stakeholder/Stakeholder.swift
index 006d140c..c14dc285 100644
--- a/Sources/PayPal/Models/Business/Stakeholder/Stakeholder.swift
+++ b/Sources/PayPal/Models/Business/Stakeholder/Stakeholder.swift
@@ -3,7 +3,7 @@ import Vapor
 extension Business {
     
     /// A person or business that acts as a stakeholder to a business.
-    public struct Stakeholder: Content, ValidationSetable, Equatable {
+    public struct Stakeholder: Content, Equatable {
         
         /// The percentage ownership for a stakeholder. Pertains only to the `BENEFICIAL_OWNER` type.
         public var ownership: String?
@@ -11,15 +11,14 @@ extension Business {
         /// The type of stakeholder in the business.
         public var type: StakeholderType?
         
-        /// The [two-character IS0-3166-1 country code](https://developer.paypal.com/docs/integration/direct/rest/country-codes/) of the country of residence.
-        ///
-        /// This property can be set using the `Stakeholder.set(_:)` method. This method
-        /// verifies the new value before assigning it to the property.
+        /// The [two-character IS0-3166-1 country code](https://developer.paypal.com/docs/integration/direct/rest/country-codes/)
+        /// of the country of residence.
         ///
         /// Pattern: `^([A-Z]{2}|C2)$`
-        public private(set) var country: String?
+        public var country: Country?
         
-        /// The date of birth, in [Internet date and time `full-date` format](https://tools.ietf.org/html/rfc3339#section-5.6). Supports the `YYYY-MM-DD` format.
+        /// The date of birth, in [Internet date and time `full-date` format](https://tools.ietf.org/html/rfc3339#section-5.6).
+        /// Supports the `YYYY-MM-DD` format.
         public var birth: TimelessDate?
         
         /// The name of the stakeholder.
@@ -53,14 +52,14 @@ extension Business {
         public init(
             ownership: String? = nil,
             type: StakeholderType?,
-            country: String?,
+            country: Country?,
             birth: TimelessDate?,
             name: PayPal.Name?,
             addresses: [Address]?,
             phones: [TypedPhoneNumber]?,
             ids: [Identification]?,
             birthplace: BirthPlace?
-        )throws {
+        ) {
             self.ownership = ownership
             self.type = type
             self.country = country
@@ -70,40 +69,6 @@ extension Business {
             self.phones = phones
             self.ids = ids
             self.birthplace = birthplace
-            
-            try self.set(\.country <~ country)
-        }
-        
-        /// See [`Decodable.init(from:)`](https://developer.apple.com/documentation/swift/decodable/2894081-init).
-        public init(from decoder: Decoder)throws {
-            let container = try decoder.container(keyedBy: CodingKeys.self)
-            let country = try container.decodeIfPresent(String.self, forKey: .country)
-            
-            self.country = country
-            self.ownership = try container.decodeIfPresent(String.self, forKey: .ownership)
-            self.type = try container.decodeIfPresent(StakeholderType.self, forKey: .type)
-            self.birth = try container.decodeIfPresent(TimelessDate.self, forKey: .birth)
-            self.name = try container.decodeIfPresent(PayPal.Name.self, forKey: .name)
-            self.addresses = try container.decodeIfPresent([Address].self, forKey: .addresses)
-            self.phones = try container.decodeIfPresent([TypedPhoneNumber].self, forKey: .phones)
-            self.ids = try container.decodeIfPresent([Identification].self, forKey: .ids)
-            self.birthplace = try container.decodeIfPresent(BirthPlace.self, forKey: .birthplace)
-            
-            try self.set(\.country <~ country)
-        }
-        
-        /// See `ValidationSetable.setterValidations()`.
-        public func setterValidations() -> SetterValidations<Business.Stakeholder> {
-            var validations = SetterValidations(Stakeholder.self)
-            
-            validations.set(\.country) { country in
-                guard let country = country else { return }
-                guard country.range(of: "^([A-Z]{2}|C2)$", options: .regularExpression) != nil else {
-                    throw PayPalError(status: .badRequest, identifier: "malformedString", reason: "`country` value must match RegEx pattern `^([A-Z]{2}|C2)$`")
-                }
-            }
-            
-            return validations
         }
         
         enum CodingKeys: String, CodingKey {
diff --git a/Sources/PayPal/Models/Charge.swift b/Sources/PayPal/Models/Charge/Charge.swift
similarity index 84%
rename from Sources/PayPal/Models/Charge.swift
rename to Sources/PayPal/Models/Charge/Charge.swift
index fc594a4e..32660488 100644
--- a/Sources/PayPal/Models/Charge.swift
+++ b/Sources/PayPal/Models/Charge/Charge.swift
@@ -12,12 +12,12 @@ public struct Charge: Content, Equatable {
     public var type: ChargeType
     
     /// The currency and amount for this charge model.
-    public var amount: Money
+    public var amount: CurrencyCodeAmount
     
     /// Creates a new `Charge` instance.
     ///
     ///     Charge(type: .tax, amount: Money(currency: .usd, value: "0.53")
-    public init(type: ChargeType, amount: Money) {
+    public init(type: ChargeType, amount: CurrencyCodeAmount) {
         self.id = nil
         self.type = type
         self.amount = amount
diff --git a/Sources/PayPal/Models/ChargeType.swift b/Sources/PayPal/Models/Charge/ChargeType.swift
similarity index 100%
rename from Sources/PayPal/Models/ChargeType.swift
rename to Sources/PayPal/Models/Charge/ChargeType.swift
diff --git a/Sources/PayPal/Models/CounterParty.swift b/Sources/PayPal/Models/Charge/CounterParty.swift
similarity index 73%
rename from Sources/PayPal/Models/CounterParty.swift
rename to Sources/PayPal/Models/Charge/CounterParty.swift
index 1b11e892..15241588 100644
--- a/Sources/PayPal/Models/CounterParty.swift
+++ b/Sources/PayPal/Models/Charge/CounterParty.swift
@@ -21,11 +21,6 @@ public struct CounterParty: Content, Equatable {
         self.name = name
     }
     
-    /// Compares two `CounterParty` objects, checking that the `email`, `phoneNumber`, and `name` properties are equal.
-    public static func == (lhs: CounterParty, rhs: CounterParty) -> Bool {
-        return (lhs.email == rhs.email) && (lhs.phoneNumber == rhs.phoneNumber) && (lhs.name == rhs.name)
-    }
-    
     enum CodingKeys: String, CodingKey {
         case email, name
         case phoneNumber = "phone_number"
diff --git a/Sources/PayPal/Models/Country.swift b/Sources/PayPal/Models/Country.swift
new file mode 100644
index 00000000..23b4935e
--- /dev/null
+++ b/Sources/PayPal/Models/Country.swift
@@ -0,0 +1,1010 @@
+import Vapor
+
+/// The valid country codes for PayPal resources.
+public enum Country: String, Hashable, CaseIterable, Content {
+    
+    /// `AL`
+    ///
+    /// ALBANIA
+    case albania = "AL"
+    
+    /// `DZ`
+    ///
+    /// ALGERIA
+    case algeria = "DZ"
+    
+    /// `AD`
+    ///
+    /// ANDORRA
+    case andorra = "AD"
+    
+    /// `AO`
+    ///
+    /// ANGOLA
+    case angola = "AO"
+    
+    /// `AI`
+    ///
+    /// ANGUILLA
+    case anguilla = "AI"
+    
+    /// `AG`
+    ///
+    /// ANTIGUA & BARBUDA
+    case antiguaBarbuda = "AG"
+    
+    /// `AR`
+    ///
+    /// ARGENTINA
+    case argentina = "AR"
+    
+    /// `AM`
+    ///
+    /// ARMENIA
+    case armenia = "AM"
+    
+    /// `AW`
+    ///
+    /// ARUBA
+    case aruba = "AW"
+    
+    /// `AU`
+    ///
+    /// AUSTRALIA
+    case australia = "AU"
+    
+    /// `AT`
+    ///
+    /// AUSTRIA
+    case austria = "AT"
+    
+    /// `AZ`
+    ///
+    /// AZERBAIJAN
+    case azerbaijan = "AZ"
+    
+    /// `BS`
+    ///
+    /// BAHAMAS
+    case bahamas = "BS"
+    
+    /// `BH`
+    ///
+    /// BAHRAIN
+    case bahrain = "BH"
+    
+    /// `BB`
+    ///
+    /// BARBADOS
+    case barbados = "BB"
+    
+    /// `BY`
+    ///
+    /// BELARUS
+    case belarus = "BY"
+    
+    /// `BE`
+    ///
+    /// BELGIUM
+    case belgium = "BE"
+    
+    /// `BZ`
+    ///
+    /// BELIZE
+    case belize = "BZ"
+    
+    /// `BJ`
+    ///
+    /// BENIN
+    case benin = "BJ"
+    
+    /// `BM`
+    ///
+    /// BERMUDA
+    case bermuda = "BM"
+    
+    /// `BT`
+    ///
+    /// BHUTAN
+    case bhutan = "BT"
+    
+    /// `BO`
+    ///
+    /// BOLIVIA
+    case bolivia = "BO"
+    
+    /// `BA`
+    ///
+    /// BOSNIA & HERZEGOVINA
+    case bosniaHerzegovina = "BA"
+    
+    /// `BW`
+    ///
+    /// BOTSWANA
+    case botswana = "BW"
+    
+    /// `BR`
+    ///
+    /// BRAZIL
+    case brazil = "BR"
+    
+    /// `VG`
+    ///
+    /// BRITISH VIRGIN ISLANDS
+    case britishVirginIslands = "VG"
+    
+    /// `BN`
+    ///
+    /// BRUNEI
+    case brunei = "BN"
+    
+    /// `BG`
+    ///
+    /// BULGARIA
+    case bulgaria = "BG"
+    
+    /// `BF`
+    ///
+    /// BURKINA FASO
+    case burkinaFaso = "BF"
+    
+    /// `BI`
+    ///
+    /// BURUNDI
+    case burundi = "BI"
+    
+    /// `KH`
+    ///
+    /// CAMBODIA
+    case cambodia = "KH"
+    
+    /// `CM`
+    ///
+    /// CAMEROON
+    case cameroon = "CM"
+    
+    /// `CA`
+    ///
+    /// CANADA
+    case canada = "CA"
+    
+    /// `CV`
+    ///
+    /// CAPE VERDE
+    case capeVerde = "CV"
+    
+    /// `KY`
+    ///
+    /// CAYMAN ISLANDS
+    case caymanIslands = "KY"
+    
+    /// `TD`
+    ///
+    /// CHAD
+    case chad = "TD"
+    
+    /// `CL`
+    ///
+    /// CHILE
+    case chile = "CL"
+    
+    /// `C2`
+    ///
+    /// CHINA
+    case china = "C2"
+    
+    /// `CO`
+    ///
+    /// COLOMBIA
+    case colombia = "CO"
+    
+    /// `KM`
+    ///
+    /// COMOROS
+    case comoros = "KM"
+    
+    /// `CG`
+    ///
+    /// CONGO - BRAZZAVILLE
+    case congoBrazzaville = "CG"
+    
+    /// `CD`
+    ///
+    /// CONGO - KINSHASA
+    case congoKinshasa = "CD"
+    
+    /// `CK`
+    ///
+    /// COOK ISLANDS
+    case cookIslands = "CK"
+    
+    /// `CR`
+    ///
+    /// COSTA RICA
+    case costaRica = "CR"
+    
+    /// `CI`
+    ///
+    /// CÔTE D’IVOIRE
+    case côteDivoire = "CI"
+    
+    /// `HR`
+    ///
+    /// CROATIA
+    case croatia = "HR"
+    
+    /// `CY`
+    ///
+    /// CYPRUS
+    case cyprus = "CY"
+    
+    /// `CZ`
+    ///
+    /// CZECH REPUBLIC
+    case czechRepublic = "CZ"
+    
+    /// `DK`
+    ///
+    /// DENMARK
+    case denmark = "DK"
+    
+    /// `DJ`
+    ///
+    /// DJIBOUTI
+    case djibouti = "DJ"
+    
+    /// `DM`
+    ///
+    /// DOMINICA
+    case dominica = "DM"
+    
+    /// `DO`
+    ///
+    /// DOMINICAN REPUBLIC
+    case dominicanRepublic = "DO"
+    
+    /// `EC`
+    ///
+    /// ECUADOR
+    case ecuador = "EC"
+    
+    /// `EG`
+    ///
+    /// EGYPT
+    case egypt = "EG"
+    
+    /// `SV`
+    ///
+    /// EL SALVADOR
+    case elSalvador = "SV"
+    
+    /// `ER`
+    ///
+    /// ERITREA
+    case eritrea = "ER"
+    
+    /// `EE`
+    ///
+    /// ESTONIA
+    case estonia = "EE"
+    
+    /// `ET`
+    ///
+    /// ETHIOPIA
+    case ethiopia = "ET"
+    
+    /// `FK`
+    ///
+    /// FALKLAND ISLANDS
+    case falklandIslands = "FK"
+    
+    /// `FO`
+    ///
+    /// FAROE ISLANDS
+    case faroeIslands = "FO"
+    
+    /// `FJ`
+    ///
+    /// FIJI
+    case fiji = "FJ"
+    
+    /// `FI`
+    ///
+    /// FINLAND
+    case finland = "FI"
+    
+    /// `FR`
+    ///
+    /// FRANCE
+    case france = "FR"
+    
+    /// `GF`
+    ///
+    /// FRENCH GUIANA
+    case frenchGuiana = "GF"
+    
+    /// `PF`
+    ///
+    /// FRENCH POLYNESIA
+    case frenchPolynesia = "PF"
+    
+    /// `GA`
+    ///
+    /// GABON
+    case gabon = "GA"
+    
+    /// `GM`
+    ///
+    /// GAMBIA
+    case gambia = "GM"
+    
+    /// `GE`
+    ///
+    /// GEORGIA
+    case georgia = "GE"
+    
+    /// `DE`
+    ///
+    /// GERMANY
+    case germany = "DE"
+    
+    /// `GI`
+    ///
+    /// GIBRALTAR
+    case gibraltar = "GI"
+    
+    /// `GR`
+    ///
+    /// GREECE
+    case greece = "GR"
+    
+    /// `GL`
+    ///
+    /// GREENLAND
+    case greenland = "GL"
+    
+    /// `GD`
+    ///
+    /// GRENADA
+    case grenada = "GD"
+    
+    /// `GP`
+    ///
+    /// GUADELOUPE
+    case guadeloupe = "GP"
+    
+    /// `GT`
+    ///
+    /// GUATEMALA
+    case guatemala = "GT"
+    
+    /// `GN`
+    ///
+    /// GUINEA
+    case guinea = "GN"
+    
+    /// `GW`
+    ///
+    /// GUINEA-BISSAU
+    case guineaBissau = "GW"
+    
+    /// `GY`
+    ///
+    /// GUYANA
+    case guyana = "GY"
+    
+    /// `HN`
+    ///
+    /// HONDURAS
+    case honduras = "HN"
+    
+    /// `HK`
+    ///
+    /// HONG KONG SAR CHINA
+    case hongKongSarChina = "HK"
+    
+    /// `HU`
+    ///
+    /// HUNGARY
+    case hungary = "HU"
+    
+    /// `IS`
+    ///
+    /// ICELAND
+    case iceland = "IS"
+    
+    /// `IN`
+    ///
+    /// INDIA
+    case india = "IN"
+    
+    /// `ID`
+    ///
+    /// INDONESIA
+    case indonesia = "ID"
+    
+    /// `IE`
+    ///
+    /// IRELAND
+    case ireland = "IE"
+    
+    /// `IL`
+    ///
+    /// ISRAEL
+    case israel = "IL"
+    
+    /// `IT`
+    ///
+    /// ITALY
+    case italy = "IT"
+    
+    /// `JM`
+    ///
+    /// JAMAICA
+    case jamaica = "JM"
+    
+    /// `JP`
+    ///
+    /// JAPAN
+    case japan = "JP"
+    
+    /// `JO`
+    ///
+    /// JORDAN
+    case jordan = "JO"
+    
+    /// `KZ`
+    ///
+    /// KAZAKHSTAN
+    case kazakhstan = "KZ"
+    
+    /// `KE`
+    ///
+    /// KENYA
+    case kenya = "KE"
+    
+    /// `KI`
+    ///
+    /// KIRIBATI
+    case kiribati = "KI"
+    
+    /// `KW`
+    ///
+    /// KUWAIT
+    case kuwait = "KW"
+    
+    /// `KG`
+    ///
+    /// KYRGYZSTAN
+    case kyrgyzstan = "KG"
+    
+    /// `LA`
+    ///
+    /// LAOS
+    case laos = "LA"
+    
+    /// `LV`
+    ///
+    /// LATVIA
+    case latvia = "LV"
+    
+    /// `LS`
+    ///
+    /// LESOTHO
+    case lesotho = "LS"
+    
+    /// `LI`
+    ///
+    /// LIECHTENSTEIN
+    case liechtenstein = "LI"
+    
+    /// `LT`
+    ///
+    /// LITHUANIA
+    case lithuania = "LT"
+    
+    /// `LU`
+    ///
+    /// LUXEMBOURG
+    case luxembourg = "LU"
+    
+    /// `MK`
+    ///
+    /// MACEDONIA
+    case macedonia = "MK"
+    
+    /// `MG`
+    ///
+    /// MADAGASCAR
+    case madagascar = "MG"
+    
+    /// `MW`
+    ///
+    /// MALAWI
+    case malawi = "MW"
+    
+    /// `MY`
+    ///
+    /// MALAYSIA
+    case malaysia = "MY"
+    
+    /// `MV`
+    ///
+    /// MALDIVES
+    case maldives = "MV"
+    
+    /// `ML`
+    ///
+    /// MALI
+    case mali = "ML"
+    
+    /// `MT`
+    ///
+    /// MALTA
+    case malta = "MT"
+    
+    /// `MH`
+    ///
+    /// MARSHALL ISLANDS
+    case marshallIslands = "MH"
+    
+    /// `MQ`
+    ///
+    /// MARTINIQUE
+    case martinique = "MQ"
+    
+    /// `MR`
+    ///
+    /// MAURITANIA
+    case mauritania = "MR"
+    
+    /// `MU`
+    ///
+    /// MAURITIUS
+    case mauritius = "MU"
+    
+    /// `YT`
+    ///
+    /// MAYOTTE
+    case mayotte = "YT"
+    
+    /// `MX`
+    ///
+    /// MEXICO
+    case mexico = "MX"
+    
+    /// `FM`
+    ///
+    /// MICRONESIA
+    case micronesia = "FM"
+    
+    /// `MD`
+    ///
+    /// MOLDOVA
+    case moldova = "MD"
+    
+    /// `MC`
+    ///
+    /// MONACO
+    case monaco = "MC"
+    
+    /// `MN`
+    ///
+    /// MONGOLIA
+    case mongolia = "MN"
+    
+    /// `ME`
+    ///
+    /// MONTENEGRO
+    case montenegro = "ME"
+    
+    /// `MS`
+    ///
+    /// MONTSERRAT
+    case montserrat = "MS"
+    
+    /// `MA`
+    ///
+    /// MOROCCO
+    case morocco = "MA"
+    
+    /// `MZ`
+    ///
+    /// MOZAMBIQUE
+    case mozambique = "MZ"
+    
+    /// `NA`
+    ///
+    /// NAMIBIA
+    case namibia = "NA"
+    
+    /// `NR`
+    ///
+    /// NAURU
+    case nauru = "NR"
+    
+    /// `NP`
+    ///
+    /// NEPAL
+    case nepal = "NP"
+    
+    /// `NL`
+    ///
+    /// NETHERLANDS
+    case netherlands = "NL"
+    
+    /// `NC`
+    ///
+    /// NEW CALEDONIA
+    case newCaledonia = "NC"
+    
+    /// `NZ`
+    ///
+    /// NEW ZEALAND
+    case newZealand = "NZ"
+    
+    /// `NI`
+    ///
+    /// NICARAGUA
+    case nicaragua = "NI"
+    
+    /// `NE`
+    ///
+    /// NIGER
+    case niger = "NE"
+    
+    /// `NG`
+    ///
+    /// NIGERIA
+    case nigeria = "NG"
+    
+    /// `NU`
+    ///
+    /// NIUE
+    case niue = "NU"
+    
+    /// `NF`
+    ///
+    /// NORFOLK ISLAND
+    case norfolkIsland = "NF"
+    
+    /// `NO`
+    ///
+    /// NORWAY
+    case norway = "NO"
+    
+    /// `OM`
+    ///
+    /// OMAN
+    case oman = "OM"
+    
+    /// `PW`
+    ///
+    /// PALAU
+    case palau = "PW"
+    
+    /// `PA`
+    ///
+    /// PANAMA
+    case panama = "PA"
+    
+    /// `PG`
+    ///
+    /// PAPUA NEW GUINEA
+    case papuaNewGuinea = "PG"
+    
+    /// `PY`
+    ///
+    /// PARAGUAY
+    case paraguay = "PY"
+    
+    /// `PE`
+    ///
+    /// PERU
+    case peru = "PE"
+    
+    /// `PH`
+    ///
+    /// PHILIPPINES
+    case philippines = "PH"
+    
+    /// `PN`
+    ///
+    /// PITCAIRN ISLANDS
+    case pitcairnIslands = "PN"
+    
+    /// `PL`
+    ///
+    /// POLAND
+    case poland = "PL"
+    
+    /// `PT`
+    ///
+    /// PORTUGAL
+    case portugal = "PT"
+    
+    /// `QA`
+    ///
+    /// QATAR
+    case qatar = "QA"
+    
+    /// `RE`
+    ///
+    /// RÉUNION
+    case reunion = "RE"
+    
+    /// `RO`
+    ///
+    /// ROMANIA
+    case romania = "RO"
+    
+    /// `RU`
+    ///
+    /// RUSSIA
+    case russia = "RU"
+    
+    /// `RW`
+    ///
+    /// RWANDA
+    case rwanda = "RW"
+    
+    /// `WS`
+    ///
+    /// SAMOA
+    case samoa = "WS"
+    
+    /// `SM`
+    ///
+    /// SAN MARINO
+    case sanMarino = "SM"
+    
+    /// `ST`
+    ///
+    /// SÃO TOMÉ & PRÍNCIPE
+    case saoTomePríncipe = "ST"
+    
+    /// `SA`
+    ///
+    /// SAUDI ARABIA
+    case saudiArabia = "SA"
+    
+    /// `SN`
+    ///
+    /// SENEGAL
+    case senegal = "SN"
+    
+    /// `RS`
+    ///
+    /// SERBIA
+    case serbia = "RS"
+    
+    /// `SC`
+    ///
+    /// SEYCHELLES
+    case seychelles = "SC"
+    
+    /// `SL`
+    ///
+    /// SIERRA LEONE
+    case sierraLeone = "SL"
+    
+    /// `SG`
+    ///
+    /// SINGAPORE
+    case singapore = "SG"
+    
+    /// `SK`
+    ///
+    /// SLOVAKIA
+    case slovakia = "SK"
+    
+    /// `SI`
+    ///
+    /// SLOVENIA
+    case slovenia = "SI"
+    
+    /// `SB`
+    ///
+    /// SOLOMON ISLANDS
+    case solomonIslands = "SB"
+    
+    /// `SO`
+    ///
+    /// SOMALIA
+    case somalia = "SO"
+    
+    /// `ZA`
+    ///
+    /// SOUTH AFRICA
+    case southAfrica = "ZA"
+    
+    /// `KR`
+    ///
+    /// SOUTH KOREA
+    case southKorea = "KR"
+    
+    /// `ES`
+    ///
+    /// SPAIN
+    case spain = "ES"
+    
+    /// `LK`
+    ///
+    /// SRI LANKA
+    case sriLanka = "LK"
+    
+    /// `SH`
+    ///
+    /// ST. HELENA
+    case stHelena = "SH"
+    
+    /// `KN`
+    ///
+    /// ST. KITTS & NEVIS
+    case stKittsNevis = "KN"
+    
+    /// `LC`
+    ///
+    /// ST. LUCIA
+    case stLucia = "LC"
+    
+    /// `PM`
+    ///
+    /// ST. PIERRE & MIQUELON
+    case stPierreMiquelon = "PM"
+    
+    /// `VC`
+    ///
+    /// ST. VINCENT & GRENADINES
+    case stVincentGrenadines = "VC"
+    
+    /// `SR`
+    ///
+    /// SURINAME
+    case suriname = "SR"
+    
+    /// `SJ`
+    ///
+    /// SVALBARD & JAN MAYEN
+    case svalbardJanMayen = "SJ"
+    
+    /// `SZ`
+    ///
+    /// SWAZILAND
+    case swaziland = "SZ"
+    
+    /// `SE`
+    ///
+    /// SWEDEN
+    case sweden = "SE"
+    
+    /// `CH`
+    ///
+    /// SWITZERLAND
+    case switzerland = "CH"
+    
+    /// `TW`
+    ///
+    /// TAIWAN
+    case taiwan = "TW"
+    
+    /// `TJ`
+    ///
+    /// TAJIKISTAN
+    case tajikistan = "TJ"
+    
+    /// `TZ`
+    ///
+    /// TANZANIA
+    case tanzania = "TZ"
+    
+    /// `TH`
+    ///
+    /// THAILAND
+    case thailand = "TH"
+    
+    /// `TG`
+    ///
+    /// TOGO
+    case togo = "TG"
+    
+    /// `TO`
+    ///
+    /// TONGA
+    case tonga = "TO"
+    
+    /// `TT`
+    ///
+    /// TRINIDAD & TOBAGO
+    case trinidadTobago = "TT"
+    
+    /// `TN`
+    ///
+    /// TUNISIA
+    case tunisia = "TN"
+    
+    /// `TM`
+    ///
+    /// TURKMENISTAN
+    case turkmenistan = "TM"
+    
+    /// `TC`
+    ///
+    /// TURKS & CAICOS ISLANDS
+    case turksCaicosIslands = "TC"
+    
+    /// `TV`
+    ///
+    /// TUVALU
+    case tuvalu = "TV"
+    
+    /// `UG`
+    ///
+    /// UGANDA
+    case uganda = "UG"
+    
+    /// `UA`
+    ///
+    /// UKRAINE
+    case ukraine = "UA"
+    
+    /// `AE`
+    ///
+    /// UNITED ARAB EMIRATES
+    case unitedArabEmirates = "AE"
+    
+    /// `GB`
+    ///
+    /// UNITED KINGDOM
+    case unitedKingdom = "GB"
+    
+    /// `US`
+    ///
+    /// UNITED STATES
+    case unitedStates = "US"
+    
+    /// `UY`
+    ///
+    /// URUGUAY
+    case uruguay = "UY"
+    
+    /// `VU`
+    ///
+    /// VANUATU
+    case vanuatu = "VU"
+    
+    /// `VA`
+    ///
+    /// VATICAN CITY
+    case vaticanCity = "VA"
+    
+    /// `VE`
+    ///
+    /// VENEZUELA
+    case venezuela = "VE"
+    
+    /// `VN`
+    ///
+    /// VIETNAM
+    case vietnam = "VN"
+    
+    /// `WF`
+    ///
+    /// WALLIS & FUTUNA
+    case wallisFutuna = "WF"
+    
+    /// `YE`
+    ///
+    /// YEMEN
+    case yemen = "YE"
+    
+    /// `ZM`
+    ///
+    /// ZAMBIA
+    case zambia = "ZM"
+    
+    /// `ZW`
+    ///
+    /// ZIMBABWE
+    case zimbabwe = "ZW"
+}
diff --git a/Sources/PayPal/Models/CreditCard/CreditCard.swift b/Sources/PayPal/Models/CreditCard/CreditCard.swift
index 9293581a..601e49cd 100644
--- a/Sources/PayPal/Models/CreditCard/CreditCard.swift
+++ b/Sources/PayPal/Models/CreditCard/CreditCard.swift
@@ -46,7 +46,7 @@ public struct CreditCard: Content, ValidationSetable, Equatable {
     public private(set) var customerID: String?
     
     /// The state of the funding instrument.
-    public let state: CreditCardState?
+    public let state: CreditCard.State?
     
     /// The date and time when the credit card becomes unusable from the vault.
     /// The `valid_until` parameter is not the same as the expiration month and year.
@@ -105,7 +105,7 @@ public struct CreditCard: Content, ValidationSetable, Equatable {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         
         self.id = try container.decodeIfPresent(String.self, forKey: .id)
-        self.state = try container.decodeIfPresent(CreditCardState.self, forKey: .state)
+        self.state = try container.decodeIfPresent(CreditCard.State.self, forKey: .state)
         self.validUntil = try container.decodeIfPresent(Date.self, forKey: .validUntil)
         self.links = try container.decodeIfPresent([LinkDescription].self, forKey: .links)
         
diff --git a/Sources/PayPal/Models/CreditCard/CreditCardState.swift b/Sources/PayPal/Models/CreditCard/CreditCardState.swift
new file mode 100644
index 00000000..67381f83
--- /dev/null
+++ b/Sources/PayPal/Models/CreditCard/CreditCardState.swift
@@ -0,0 +1,14 @@
+import Vapor
+
+extension CreditCard {
+    
+    /// The credit card state that defines whether a card can still be used or has expired.
+    public enum State: String, Hashable, CaseIterable, Content {
+        
+        /// The credit card number is still valid.
+        case ok
+        
+        /// The specified credit card number has expired.
+        case expired
+    }
+}
diff --git a/Sources/PayPal/Models/CreditCardState.swift b/Sources/PayPal/Models/CreditCardState.swift
deleted file mode 100644
index 57bcfd9d..00000000
--- a/Sources/PayPal/Models/CreditCardState.swift
+++ /dev/null
@@ -1,11 +0,0 @@
-import Vapor
-
-/// The credit card state that defines whether a card can still be used or has expired.
-public enum CreditCardState: String, Hashable, CaseIterable, Content {
-    
-    /// The credit card number is still valid.
-    case ok
-    
-    /// The specified credit card number has expired.
-    case expired
-}
diff --git a/Sources/PayPal/Models/CustomerDispute/AcceptBody.swift b/Sources/PayPal/Models/CustomerDispute/AcceptBody.swift
index d1abb5f1..088ed5c3 100644
--- a/Sources/PayPal/Models/CustomerDispute/AcceptBody.swift
+++ b/Sources/PayPal/Models/CustomerDispute/AcceptBody.swift
@@ -28,7 +28,7 @@ public struct AcceptDisputeBody: Content, ValidationSetable, Equatable {
     /// The subsequent action depends on the amount:
     /// - If this amount is less than the customer-requested amount, the dispute updates to require customer acceptance.
     /// - If this amount is equal to or greater than the customer-requested amount, this amount is automatically refunded to the customer and the dispute closes.
-    public var refund: Money?
+    public var refund: CurrencyCodeAmount?
     
     
     /// Creates a new `AcceptDisputeBody` instance.
@@ -40,7 +40,7 @@ public struct AcceptDisputeBody: Content, ValidationSetable, Equatable {
     ///         returnAddress: nil,
     ///         refund: Money(currency: .usd, value: "55.50")
     ///     )
-    public init(note: String?, reason: Reason?, invoiceID: String?, returnAddress: Address?, refund: Money?)throws {
+    public init(note: String?, reason: Reason?, invoiceID: String?, returnAddress: Address?, refund: CurrencyCodeAmount?)throws {
         self.note = note
         self.reason = reason
         self.invoiceID = invoiceID
@@ -59,7 +59,7 @@ public struct AcceptDisputeBody: Content, ValidationSetable, Equatable {
         self.reason = try container.decodeIfPresent(Reason.self, forKey: .reason)
         self.invoiceID = try container.decodeIfPresent(String.self, forKey: .invoiceID)
         self.returnAddress = try container.decodeIfPresent(Address.self, forKey: .returnAddress)
-        self.refund = try container.decodeIfPresent(Money.self, forKey: .refund)
+        self.refund = try container.decodeIfPresent(CurrencyCodeAmount.self, forKey: .refund)
         
         try self.set(\.note <~ note)
     }
diff --git a/Sources/PayPal/Models/CustomerDispute/CustomerDispute.swift b/Sources/PayPal/Models/CustomerDispute/CustomerDispute.swift
index 55a4a95b..3ef52d29 100644
--- a/Sources/PayPal/Models/CustomerDispute/CustomerDispute.swift
+++ b/Sources/PayPal/Models/CustomerDispute/CustomerDispute.swift
@@ -51,7 +51,7 @@ public struct CustomerDispute: Content, ValidationSetable, Equatable {
     
     /// The amount in the transaction that the customer originally disputed. Because customers can sometimes dispute
     /// only part of the payment, the disputed amount might be different from the total gross or net amount of the original transaction.
-    public var amount: Money?
+    public var amount: CurrencyCodeAmount?
     
     /// An array of messages that the customer or merchant posted.
     public var messages: [Message]?
@@ -86,7 +86,7 @@ public struct CustomerDispute: Content, ValidationSetable, Equatable {
     ///         messages: nil,
     ///         responseDue: Date(timeIntervalSinceNow: 60 * 60 * 24).iso8601
     ///     )
-    public init(transactions: [TransactionInfo]?, reason: Item.Reason?, amount: Money?, messages: [Message]?, responseDue: String?)throws {
+    public init(transactions: [TransactionInfo]?, reason: Item.Reason?, amount: CurrencyCodeAmount?, messages: [Message]?, responseDue: String?)throws {
         self.id = nil
         self.created = nil
         self.updated = nil
@@ -123,7 +123,7 @@ public struct CustomerDispute: Content, ValidationSetable, Equatable {
         
         self.transactions = try container.decodeIfPresent([TransactionInfo].self, forKey: .transactions)
         self.reason = try container.decodeIfPresent(Item.Reason.self, forKey: .reason)
-        self.amount = try container.decodeIfPresent(Money.self, forKey: .amount)
+        self.amount = try container.decodeIfPresent(CurrencyCodeAmount.self, forKey: .amount)
         self.messages = try container.decodeIfPresent([Message].self, forKey: .messages)
         self.responseDue = try container.decodeIfPresent(String.self, forKey: .responseDue)
         
diff --git a/Sources/PayPal/Models/CustomerDispute/Item.swift b/Sources/PayPal/Models/CustomerDispute/Item.swift
index 46e1d04a..adb84ec1 100644
--- a/Sources/PayPal/Models/CustomerDispute/Item.swift
+++ b/Sources/PayPal/Models/CustomerDispute/Item.swift
@@ -15,22 +15,20 @@ public struct Item: Content, Equatable {
     public var reason: Reason?
     
     /// The amount of the item in the dispute.
-    public var amount: Money?
+    public var amount: CurrencyCodeAmount?
     
     /// Any notes provided with the item.
     public var notes: String?
     
     /// Creates a new `Item` instance.
     ///
-    ///     Item(
-    ///         id: "3B246A14-8C7E-4866-AF5E-416A9654C269",
-    ///         transactionID: "EA4C08F9-A0DC-422A-BFA4-89AE0792A84A",
-    ///         reason: .incorrectAmount,
-    ///         amount: Money(currency: .usd, value: "48.95"),
-    ///         notes: nil
-    ///     )
-    public init(id: String?, transactionID: String?, reason: Reason?, amount: Money?, notes: String?) {
-        self.id = id
+    /// - Parameters:
+    ///   - transactionID: The ID of the transaction in the partner system.
+    ///   - reason: The reason for the item-level dispute.
+    ///   - amount: The amount of the item in the dispute.
+    ///   - notes: Any notes provided with the item.
+    public init(transactionID: String?, reason: Reason?, amount: CurrencyCodeAmount?, notes: String?) {
+        self.id = nil
         self.transactionID = transactionID
         self.reason = reason
         self.amount = amount
diff --git a/Sources/PayPal/Models/CustomerDispute/Offer.swift b/Sources/PayPal/Models/CustomerDispute/Offer.swift
index f150fd5e..7f92d005 100644
--- a/Sources/PayPal/Models/CustomerDispute/Offer.swift
+++ b/Sources/PayPal/Models/CustomerDispute/Offer.swift
@@ -4,10 +4,10 @@ import Vapor
 public struct Offer: Content, Equatable {
     
     /// The customer-requested refund for this dispute.
-    public var buyerAmount: Money?
+    public var buyerAmount: CurrencyCodeAmount?
     
     /// The merchant-offered refund for this dispute.
-    public var sellerAmount: Money?
+    public var sellerAmount: CurrencyCodeAmount?
     
     /// The merchant-proposed offer type for the dispute.
     public var type: OfferType?
@@ -15,7 +15,7 @@ public struct Offer: Content, Equatable {
     /// Creates a new `Offer` instance,
     ///
     ///     Offer(buyerAmount: Money(currency: .usd, value: "10.99"), sellerAmount: Money(currency: .usd, value: "10.99"), type: .refund)
-    public init(buyerAmount: Money?, sellerAmount: Money?, type: OfferType?) {
+    public init(buyerAmount: CurrencyCodeAmount?, sellerAmount: CurrencyCodeAmount?, type: OfferType?) {
         self.buyerAmount = buyerAmount
         self.sellerAmount = sellerAmount
         self.type = type
diff --git a/Sources/PayPal/Models/CustomerDispute/Outcome.swift b/Sources/PayPal/Models/CustomerDispute/Outcome.swift
index b42b5f3a..408cc016 100644
--- a/Sources/PayPal/Models/CustomerDispute/Outcome.swift
+++ b/Sources/PayPal/Models/CustomerDispute/Outcome.swift
@@ -9,12 +9,12 @@ extension CustomerDispute {
         public var code: Code?
         
         /// The amount that either the merchant or PayPal refunds the customer.
-        public var refunded: Money?
+        public var refunded: CurrencyCodeAmount?
         
         /// Creates a new `CustomerDispute.Outcome` instance.
         ///
         ///     CustomerDispute.Outcome(code: .buyer, refunded: Money(currency: .usd, value: "56.72"))
-        public init(code: Code?, refunded: Money?) {
+        public init(code: Code?, refunded: CurrencyCodeAmount?) {
             self.code = code
             self.refunded = refunded
         }
diff --git a/Sources/PayPal/Models/CustomerDispute/ResolutionOffer.swift b/Sources/PayPal/Models/CustomerDispute/ResolutionOffer.swift
index 003acc57..850f624c 100644
--- a/Sources/PayPal/Models/CustomerDispute/ResolutionOffer.swift
+++ b/Sources/PayPal/Models/CustomerDispute/ResolutionOffer.swift
@@ -14,7 +14,7 @@ extension CustomerDispute {
         public private(set) var note: String
         
         /// The amount proposed to resolve the dispute.
-        public var amount: Money
+        public var amount: CurrencyCodeAmount
         
         /// The type of offer that the merchant proposes for the dispute.
         public var type: Offer.OfferType
@@ -36,7 +36,7 @@ extension CustomerDispute {
         ///         returnAddress: nil,
         ///         invoiceID: nil
         ///     )
-        public init(note: String, amount: Money, type: Offer.OfferType, returnAddress: Address?, invoiceID: String?)throws {
+        public init(note: String, amount: CurrencyCodeAmount, type: Offer.OfferType, returnAddress: Address?, invoiceID: String?)throws {
             self.note = note
             self.amount = amount
             self.type = type
@@ -52,7 +52,7 @@ extension CustomerDispute {
             let note = try container.decode(String.self, forKey: .note)
             
             self.note = note
-            self.amount = try container.decode(Money.self, forKey: .amount)
+            self.amount = try container.decode(CurrencyCodeAmount.self, forKey: .amount)
             self.type = try container.decode(Offer.OfferType.self, forKey: .type)
             self.returnAddress = try container.decodeIfPresent(Address.self, forKey: .returnAddress)
             self.invoiceID = try container.decodeIfPresent(String.self, forKey: .invoiceID)
diff --git a/Sources/PayPal/Models/CustomerDispute/TransactionInfo.swift b/Sources/PayPal/Models/CustomerDispute/TransactionInfo.swift
index a88b6cfc..ca51c4a0 100644
--- a/Sources/PayPal/Models/CustomerDispute/TransactionInfo.swift
+++ b/Sources/PayPal/Models/CustomerDispute/TransactionInfo.swift
@@ -20,7 +20,7 @@ public struct TransactionInfo: Content, Equatable {
     public var status: Status?
     
     /// The gross amount of the transaction.
-    public var gross: Money?
+    public var gross: CurrencyCodeAmount?
     
     /// The ID of the invoice for the payment.
     public var invoice: String?
@@ -53,7 +53,7 @@ public struct TransactionInfo: Content, Equatable {
         sellerID: String?,
         created: String?,
         status: Status?,
-        gross: Money?,
+        gross: CurrencyCodeAmount?,
         invoice: String?,
         custom: String?,
         buyer: Buyer?,
diff --git a/Sources/PayPal/Models/Discount.swift b/Sources/PayPal/Models/Discount.swift
index 94d7d6bd..40c394c0 100644
--- a/Sources/PayPal/Models/Discount.swift
+++ b/Sources/PayPal/Models/Discount.swift
@@ -1,7 +1,7 @@
 import Vapor
 
 /// A discount on an item in a transaction.
-public struct Discount<M>: Content, Equatable where M: Monitary {
+public struct Discount<M>: Content, Equatable where M: Amount {
     
     /// The discount as a percentage value. Value is from `0` to `100`. Supports up to five decimal places.
     public var percent: Decimal?
diff --git a/Sources/PayPal/Models/Email.swift b/Sources/PayPal/Models/Email.swift
index a203d6c4..deb1457a 100644
--- a/Sources/PayPal/Models/Email.swift
+++ b/Sources/PayPal/Models/Email.swift
@@ -61,20 +61,21 @@ public struct EmailType<Keys>: Content, ValidationSetable, Equatable where Keys:
     /// validate the the new value before assigning it to the property.
     ///
     /// Minimum length: 3. Maximum length: 254. Pattern: `^.+@[^"\-].+$`.
-    public private(set) var email: String?
+    public private(set) var email: String
     
     /// Creates a new `CCEmail` instance.
     ///
     ///     CCEmail(email: "holmer@shlock.com")
-    public init(email: String?)throws {
+    public init(email: String)throws {
         self.email = email
-        
         try self.set(\.email <~ email)
     }
     
     /// See [`Decodable.init(from:)`](https://developer.apple.com/documentation/swift/decodable/2894081-init).
     public init(from decoder: Decoder)throws {
-        self.email = try decoder.singleValueContainer().decode(String?.self)
+        let container = try decoder.singleValueContainer()
+        self.email = try container.decode(String.self)
+
         
         try self.set(\.email <~ self.email)
     }
@@ -90,7 +91,6 @@ public struct EmailType<Keys>: Content, ValidationSetable, Equatable where Keys:
         var validations = SetterValidations(EmailType<Keys>.self)
         
         validations.set(\.email) { email in
-            guard let email = email else { return }
             guard email.count >= 3 && email.count <= 254 else {
                 throw PayPalError(status: .badRequest, identifier: "invalidLength", reason: "`email` property must have a length between 3 and 254")
             }
diff --git a/Sources/PayPal/Models/Establishment.swift b/Sources/PayPal/Models/Establishment.swift
index d9744066..8f5dc50f 100644
--- a/Sources/PayPal/Models/Establishment.swift
+++ b/Sources/PayPal/Models/Establishment.swift
@@ -1,11 +1,11 @@
 import Vapor
 
 /// The place of establishment of an organization or business.
-public struct Establishment: Content, ValidationSetable, Equatable {
+public struct Establishment: Content, Equatable {
     
     /// The [state or territory](https://developer.paypal.com/docs/integration/direct/rest/state-codes/)
     /// of the government body with which the business was established.
-    public var state: String?
+    public var state: Province?
     
     /// The [two-character IS0-3166-1 country code](https://developer.paypal.com/docs/integration/direct/rest/country-codes/)
     /// of the country where the business was established.
@@ -14,42 +14,15 @@ public struct Establishment: Content, ValidationSetable, Equatable {
     ///   Use the `C2 country code for China worldwide for comparable uncontrolled price (CUP) method, bank card, and cross-border transactions.
     ///
     /// Length: 2. Pattern: `^([A-Z]{2}|C2)$`.
-    public private(set) var country: String?
+    public var country: Country?
     
     
     /// Creates a new `Establishment` instance.
     ///
     ///     Establishment(state: "KS", country: "US")
-    public init(state: String?, country: String?)throws {
+    public init(state: Province?, country: Country?) {
         self.state = state
         self.country = country
-        
-        try self.set(\.country <~ country)
-    }
-    
-    /// See [`Decodable.init(from:)`](https://developer.apple.com/documentation/swift/decodable/2894081-init).
-    public init(from decoder: Decoder)throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        let country = try container.decodeIfPresent(String.self, forKey: .country)
-        
-        self.country = country
-        self.state = try container.decodeIfPresent(String.self, forKey: .state)
-        
-        try self.set(\.country <~ country)
-    }
-    
-    /// See `ValidationSetable.setterValidations()`.
-    public func setterValidations() -> SetterValidations<Establishment> {
-        var validations = SetterValidations(Establishment.self)
-        
-        validations.set(\.country) { country in
-            guard let country = country else { return }
-            guard country.range(of: "^([A-Z]{2}|C2)$", options: .regularExpression) != nil else {
-                throw PayPalError(status: .badRequest, identifier: "malformedString", reason: "`country_code` value must match RegEx pattern `^([A-Z]{2}|C2)$`")
-            }
-        }
-        
-        return validations
     }
     
     enum CodingKeys: String, CodingKey {
diff --git a/Sources/PayPal/Models/Extensions.swift b/Sources/PayPal/Models/Extensions.swift
index 9c02510c..5bb838da 100644
--- a/Sources/PayPal/Models/Extensions.swift
+++ b/Sources/PayPal/Models/Extensions.swift
@@ -28,16 +28,6 @@ public struct Extensions: Content, Equatable {
         self.orderProperties = orderProperties
     }
     
-    /// Compares two `Extensions` objects, checking that the `paymentProperties`, `requestMoneyProperties`,
-    /// `invoiceProperties`, and `orderProperties` properties are the same
-    public static func == (lhs: Extensions, rhs: Extensions) -> Bool {
-        return
-            (lhs.paymentProperties == rhs.paymentProperties) &&
-            (lhs.requestMoneyProperties == rhs.requestMoneyProperties) &&
-            (lhs.invoiceProperties == rhs.invoiceProperties) &&
-            (lhs.orderProperties == rhs.orderProperties)
-    }
-    
     enum CodingKeys: String, CodingKey {
         case paymentProperties = "payment_properties"
         case requestMoneyProperties = "request_money_properties"
diff --git a/Sources/PayPal/Models/FinancialInstrument/FinancialInstrument.swift b/Sources/PayPal/Models/FinancialInstrument/FinancialInstrument.swift
index c5beb54b..1d4fed52 100644
--- a/Sources/PayPal/Models/FinancialInstrument/FinancialInstrument.swift
+++ b/Sources/PayPal/Models/FinancialInstrument/FinancialInstrument.swift
@@ -33,12 +33,10 @@ public struct FinancialInstrument: Content, Equatable {
     
     /// Creates a new `FinancialInstrument` instance.
     ///
-    /// - Parameters:
-    ///   - id: The PayPal-generated financial instrument ID. Defaults to `nil`.
-    ///   - accountType: The bank account type. Defaults to `.checking`.
-    public init(id: String? = nil, accountType: AccountType = .checking) {
+    /// - Parameter accountType: The bank account type. Defaults to `.checking`.
+    public init(accountType: AccountType = .checking) {
         self.type = .bank
-        self.id = id
+        self.id = nil
         self.accountType = accountType
     }
     
diff --git a/Sources/PayPal/Models/Invoice/Invoice.swift b/Sources/PayPal/Models/Invoice/Invoice.swift
index 67c27d6f..78defa67 100644
--- a/Sources/PayPal/Models/Invoice/Invoice.swift
+++ b/Sources/PayPal/Models/Invoice/Invoice.swift
@@ -19,7 +19,7 @@ public struct Invoice: Content, ValidationSetable, Equatable {
     public let status: Status?
     
     /// The total amount of the invoice.
-    public let total: Amount?
+    public let total: CurrencyAmount?
     
     /// An array of payment details for the invoice.
     public let payments: [Details]?
@@ -83,13 +83,13 @@ public struct Invoice: Content, ValidationSetable, Equatable {
     public private(set) var reference: String?
     
     /// The invoice level discount, as a percent or an amount value.
-    public var discount: Discount<Amount>?
+    public var discount: Discount<CurrencyAmount>?
     
     /// The shipping amount, as a percent or an amount value.
     public var shippingCost: ShippingCosts?
     
     /// The custom amount to apply to an invoice. If you include a label, you must include a custom amount.
-    public var custom: CustomAmount<Amount>?
+    public var custom: CustomAmount<CurrencyAmount>?
     
     /// Indicates whether the invoice allows a partial payment. If `false`, the invoice must be paid in full. If `true`, the invoice allows partial payments.
     ///
@@ -97,7 +97,7 @@ public struct Invoice: Content, ValidationSetable, Equatable {
     public var allowPartialPayment: Bool?
     
     /// The minimum amount allowed for a partial payment. Valid only if `allow_partial_payment` is true.
-    public var minimumDue: Amount?
+    public var minimumDue: CurrencyAmount?
     
     /// Indicates whether the tax is calculated before or after a discount. If `false`, the tax is calculated before a discount.
     /// If `true`, the tax is calculated after a discount.
@@ -199,11 +199,11 @@ public struct Invoice: Content, ValidationSetable, Equatable {
         date: String? = nil,
         payment: PaymentTerm? = nil,
         reference: String? = nil,
-        discount: Discount<Amount>? = nil,
+        discount: Discount<CurrencyAmount>? = nil,
         shippingCost: ShippingCosts? = nil,
-        custom: CustomAmount<Amount>? = nil,
+        custom: CustomAmount<CurrencyAmount>? = nil,
         allowPartialPayment: Bool? = nil,
-        minimumDue: Amount? = nil,
+        minimumDue: CurrencyAmount? = nil,
         taxCalculatedAfterDiscount: Bool? = nil,
         taxInclusive: Bool? = nil,
         terms: String? = nil,
@@ -274,7 +274,7 @@ public struct Invoice: Content, ValidationSetable, Equatable {
         
         self.id = try container.decodeIfPresent(String.self, forKey: .id)
         self.status = try container.decodeIfPresent(Status.self, forKey: .status)
-        self.total = try container.decodeIfPresent(Amount.self, forKey: .total)
+        self.total = try container.decodeIfPresent(CurrencyAmount.self, forKey: .total)
         self.payments = try container.decodeIfPresent([Details].self, forKey: .payments)
         self.refunds = try container.decodeIfPresent([RefundDetail].self, forKey: .refunds)
         self.metadata = try container.decodeIfPresent(Metadata.self, forKey: .metadata)
@@ -290,11 +290,11 @@ public struct Invoice: Content, ValidationSetable, Equatable {
         self.items = try container.decodeIfPresent([Item].self, forKey: .items)
         self.date = try container.decodeIfPresent(String.self, forKey: .date)
         self.payment = try container.decodeIfPresent(PaymentTerm.self, forKey: .payment)
-        self.discount = try container.decodeIfPresent(Discount<Amount>.self, forKey: .discount)
+        self.discount = try container.decodeIfPresent(Discount<CurrencyAmount>.self, forKey: .discount)
         self.shippingCost = try container.decodeIfPresent(ShippingCosts.self, forKey: .shippingCost)
-        self.custom = try container.decodeIfPresent(CustomAmount<Amount>.self, forKey: .custom)
+        self.custom = try container.decodeIfPresent(CustomAmount<CurrencyAmount>.self, forKey: .custom)
         self.allowPartialPayment = try container.decodeIfPresent(Bool.self, forKey: .allowPartialPayment)
-        self.minimumDue = try container.decodeIfPresent(Amount.self, forKey: .minimumDue)
+        self.minimumDue = try container.decodeIfPresent(CurrencyAmount.self, forKey: .minimumDue)
         self.taxCalculatedAfterDiscount = try container.decodeIfPresent(Bool.self, forKey: .taxCalculatedAfterDiscount)
         self.taxInclusive = try container.decodeIfPresent(Bool.self, forKey: .taxInclusive)
         self.allowTip = try container.decodeIfPresent(Bool.self, forKey: .allowTip)
diff --git a/Sources/PayPal/Models/Invoice/InvoiceItem.swift b/Sources/PayPal/Models/Invoice/InvoiceItem.swift
index f8b5c13e..75686ff3 100644
--- a/Sources/PayPal/Models/Invoice/InvoiceItem.swift
+++ b/Sources/PayPal/Models/Invoice/InvoiceItem.swift
@@ -31,7 +31,7 @@ extension Invoice {
         ///
         /// This property can be set using the `Item.set(_:)` method. This
         /// method will validate the new value before assigning it to the property.
-        public private(set) var unitPrice: Amount
+        public private(set) var unitPrice: CurrencyAmount
         
         /// The tax information.
         public var tax: Tax?
@@ -41,7 +41,7 @@ extension Invoice {
         public var date: String?
         
         /// The item discount, as a percent or an amount value.
-        public var discount: Discount<Amount>?
+        public var discount: Discount<CurrencyAmount>?
         
         /// The unit of measure for the invoiced item. For `AMOUNT` the `unit_price` and `quantity` are not shown on the invoice.
         ///
@@ -65,10 +65,10 @@ extension Invoice {
             name: String,
             description: String?,
             quantity: Decimal,
-            unitPrice: Amount,
+            unitPrice: CurrencyAmount,
             tax: Tax?,
             date: String?,
-            discount: Discount<Amount>?,
+            discount: Discount<CurrencyAmount>?,
             unitMeasure: Measure?
         )throws {
             self.name = name
@@ -92,7 +92,7 @@ extension Invoice {
             let name = try container.decode(String.self, forKey: .name)
             let description = try container.decodeIfPresent(String.self, forKey: .description)
             let quantity = try container.decode(Decimal.self, forKey: .quantity)
-            let unitPrice = try container.decode(Amount.self, forKey: .unitPrice)
+            let unitPrice = try container.decode(CurrencyAmount.self, forKey: .unitPrice)
             
             self.name = name
             self.description = description
@@ -100,7 +100,7 @@ extension Invoice {
             self.unitPrice = unitPrice
             self.tax = try container.decodeIfPresent(Tax.self, forKey: .tax)
             self.date = try container.decodeIfPresent(String.self, forKey: .date)
-            self.discount = try container.decodeIfPresent(Discount<Amount>.self, forKey: .discount)
+            self.discount = try container.decodeIfPresent(Discount<CurrencyAmount>.self, forKey: .discount)
             self.unitMeasure = try container.decodeIfPresent(Measure.self, forKey: .unitPrice)
             
             try self.set(\.name <~ name)
@@ -130,8 +130,7 @@ extension Invoice {
                 }
             }
             validations.set(\.unitPrice) { unitPrice in
-                guard let price = Int(unitPrice.value) else { return }
-                guard price >= -1_000_000 && price <= 1_000_000 else {
+                guard unitPrice.value >= -1_000_000 && unitPrice.value <= 1_000_000 else {
                     throw PayPalError(
                         status: .badRequest,
                         identifier: "invalidLength",
diff --git a/Sources/PayPal/Models/Invoice/InvoicePayment.swift b/Sources/PayPal/Models/Invoice/InvoicePayment.swift
index 944500a6..84e53f50 100644
--- a/Sources/PayPal/Models/Invoice/InvoicePayment.swift
+++ b/Sources/PayPal/Models/Invoice/InvoicePayment.swift
@@ -12,7 +12,7 @@ extension Invoice {
         
         /// The payment amount to record against the invoice. If you omit this parameter,
         /// the total invoice amount is marked as paid. This amount cannot exceed the amount due.
-        public var amount: Amount?
+        public var amount: CurrencyAmount?
         
         /// The date when the invoice was paid, in [Internet date and time format](https://tools.ietf.org/html/rfc3339#section-5.6).
         public var date: String?
@@ -24,7 +24,7 @@ extension Invoice {
         /// Creates a new `Invoice.Payment` instance.
         ///
         ///     Invoice.Payment(method: .cash, amount: Amount(currency: .usd, value: "20.00"), date: Date().iso8601, note: "I got the payment by cash!")
-        public init(method: PaymentDetail.Method? = nil, amount: Amount?, date: String?, note: String?) {
+        public init(method: PaymentDetail.Method? = nil, amount: CurrencyAmount?, date: String?, note: String?) {
             self.method = method
             self.amount = amount
             self.date = date
diff --git a/Sources/PayPal/Models/LinkDescription.swift b/Sources/PayPal/Models/LinkDescription.swift
index 4adda6ed..a487bd2f 100644
--- a/Sources/PayPal/Models/LinkDescription.swift
+++ b/Sources/PayPal/Models/LinkDescription.swift
@@ -26,10 +26,4 @@ public struct LinkDescription: Content, Equatable {
         self.rel = rel
         self.method = method
     }
-    
-    /// Compares two `LinkDescription` objects, checking that the `href`,
-    /// `rel`, and `method` properties are equal.
-    public static func == (lhs: LinkDescription, rhs: LinkDescription) -> Bool {
-        return (lhs.rel == rhs.rel) && (lhs.href == rhs.href) && (lhs.method == rhs.method)
-    }
 }
diff --git a/Sources/PayPal/Models/Merchant/MerchantPreferances.swift b/Sources/PayPal/Models/Merchant/MerchantPreferances.swift
index a97574f7..3df8ed1e 100644
--- a/Sources/PayPal/Models/Merchant/MerchantPreferances.swift
+++ b/Sources/PayPal/Models/Merchant/MerchantPreferances.swift
@@ -1,7 +1,7 @@
 import Vapor
 
 /// Merchant preferances that override the default information for a billing agreement.
-public struct MerchantPreferances<M>: Content, ValidationSetable, Equatable where M: Monitary {
+public struct MerchantPreferances<M>: Content, ValidationSetable, Equatable where M: Amount {
     
     /// The PayPal-generated ID for the resource.
     ///
@@ -100,20 +100,6 @@ public struct MerchantPreferances<M>: Content, ValidationSetable, Equatable wher
         )
     }
     
-    /// Compares two `MerchantPreferances` object, checking each property for equality.
-    public static func == (lhs: MerchantPreferances, rhs: MerchantPreferances) -> Bool {
-        return
-            (lhs.id == rhs.id) &&
-            (lhs.setupFee == rhs.setupFee) &&
-            (lhs.cancelURL == rhs.cancelURL) &&
-            (lhs.returnURL == rhs.returnURL) &&
-            (lhs.maxFails == rhs.maxFails) &&
-            (lhs.autoBill == rhs.autoBill) &&
-            (lhs.initialFailAction == rhs.initialFailAction) &&
-            (lhs.acceptedPaymentType == rhs.acceptedPaymentType) &&
-            (lhs.charSet == rhs.charSet)
-    }
-    
     public func setterValidations() -> SetterValidations<MerchantPreferances> {
         var validations = SetterValidations(MerchantPreferances.self)
         
diff --git a/Sources/PayPal/Models/Money/Amount.swift b/Sources/PayPal/Models/Money/Amount.swift
new file mode 100644
index 00000000..0bb3fc05
--- /dev/null
+++ b/Sources/PayPal/Models/Money/Amount.swift
@@ -0,0 +1,125 @@
+import Vapor
+
+// MARK: - Protocols
+
+/// A type that is used to represent an amount of money in an currency.
+public protocol Amount: Codable, Equatable {
+    
+    /// The currency if the money amount being represented.
+    var currency: Currency { get set }
+
+    /// The amount of the currency being represented.
+    var value: Decimal { get }
+    
+    /// The initializer signiture that should be used for types conforming to this protocol.
+    ///
+    /// This initializer should validate the incoming `value` value, and throw if it is invalid.
+    init(currency: Currency, value: Decimal)
+}
+
+/// Coding keys that can be used for a `AmountType` type.
+public protocol AmountCodingKey: CodingKey {
+    
+    /// The coding key for the `value` property.
+    static var value: Self { get }
+    
+    /// The coding key for the `currency` property.
+    static var currency: Self { get }
+}
+
+// MARK: - CodingKeys
+
+/// Coding keys for a `AmountType` type that uses `currency` as the string value for coding the `currency` property.
+public enum CurrencyKeys: String, AmountCodingKey {
+    
+    /// The actual coding key for the `value` property.
+    case _value = "value"
+    
+    /// The actual coding key for the `currency` property.
+    case _currency = "currency"
+    
+    /// The publicized `value` coding key so the `MoneyType` struct can access it.
+    public static var value: CurrencyKeys { return ._value }
+    
+    /// The publicized `currency` coding key so the `MoneyType` struct can access it.
+    public static var currency: CurrencyKeys  { return ._currency }
+}
+
+/// Coding keys for a `AmountType` type that uses `currency_code` as the string value for coding the `currency` property.
+public enum CurrencyCodeKeys: String, AmountCodingKey {
+    
+    /// The actual coding key for the `value` property.
+    case _value = "value"
+    
+    /// The actual coding key for the `currency` property.
+    case _currency = "currency_code"
+    
+    /// The publicized `value` coding key so the `MoneyType` struct can access it.
+    public static var value: CurrencyCodeKeys { return ._value }
+    
+    /// The publicized `currency` coding key so the `MoneyType` struct can access it.
+    public static var currency: CurrencyCodeKeys  { return ._currency }
+}
+
+// MARK: - Amounts
+
+/// A `AmountType` type that uses the `CurrencyKeys` coding keys for encoding/decoding.
+public typealias CurrencyAmount = AmountType<CurrencyKeys>
+
+/// A `AmountType` type that uses the `CurrencyCodeKeys` coding keys for encoding/decoding.
+public typealias CurrencyCodeAmount = AmountType<CurrencyCodeKeys>
+
+/// A generic type that represents an amount of any currency, where the properties support any coding keys.
+public struct AmountType<Key>: Content, Amount, Equatable where Key: AmountCodingKey {
+    
+    /// The currency of the money that this object represents.
+    public var currency: Currency
+    
+    /// The amount of the currency that the class instance represents.
+    ///
+    /// The value, which might be:
+    /// - An integer for currencies like JPY that are not typically fractional.
+    /// - A decimal fraction for currencies like TND that are subdivided into thousandths.
+    ///
+    /// For the required number of decimal places for a currency code, see
+    /// [Currency codes - ISO 4217](https://www.iso.org/iso-4217-currency-codes.html).
+    public private(set) var value: Decimal
+    
+    /// Creates an instance of `Self`.
+    ///
+    /// - Parameters:
+    ///   - currency: The currency of the money you're representing.
+    ///   - value: The amount of the currency to represent.
+    public init(currency: Currency, value: Decimal) {
+        self.currency = currency
+        self.value = value
+    }
+    
+    /// See [`Decodable.init(from:)`](https://developer.apple.com/documentation/swift/decodable/2894081-init).
+    public init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: Key.self)
+        let value = try container.decode(String.self, forKey: .value)
+        guard let decimal = Decimal(string: value) else {
+            throw PayPalError(status: .badRequest, identifier: "badValue", reason: "`value` value must be convertible to a decimal")
+        }
+        
+        self.currency = try container.decode(Currency.self, forKey: .currency)
+        self.value = decimal
+    }
+    
+    /// See [`Encodable.encode(to:)`](https://developer.apple.com/documentation/swift/encodable/2893603-encode).
+    ///
+    /// This implementation rounds the `value` property before encoding it as a string. The actual `value` property is not modified.
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: Key.self)
+        var rounded: Decimal = self.value
+        
+        if let exponent = self.currency.e {
+            var value: Decimal = self.value
+            NSDecimalRound(&rounded, &value, exponent, .bankers)
+        }
+        
+        try container.encode(self.currency, forKey: .currency)
+        try container.encode(String(describing: rounded), forKey: .value)
+    }
+}
diff --git a/Sources/PayPal/Models/Currency.swift b/Sources/PayPal/Models/Money/Currency.swift
similarity index 100%
rename from Sources/PayPal/Models/Currency.swift
rename to Sources/PayPal/Models/Money/Currency.swift
diff --git a/Sources/PayPal/Models/CustomAmount.swift b/Sources/PayPal/Models/Money/CustomAmount.swift
similarity index 89%
rename from Sources/PayPal/Models/CustomAmount.swift
rename to Sources/PayPal/Models/Money/CustomAmount.swift
index b01d4005..64d31278 100644
--- a/Sources/PayPal/Models/CustomAmount.swift
+++ b/Sources/PayPal/Models/Money/CustomAmount.swift
@@ -1,7 +1,7 @@
 import Vapor
 
 /// A monitary amount with a custom label.
-public struct CustomAmount<M>: Content, Equatable where M: Monitary {
+public struct CustomAmount<M>: Content, Equatable where M: Amount {
     
     /// The custom amount label.
     ///
diff --git a/Sources/PayPal/Models/Money/DetailedAmount.swift b/Sources/PayPal/Models/Money/DetailedAmount.swift
index 105e138b..2bc42af5 100644
--- a/Sources/PayPal/Models/Money/DetailedAmount.swift
+++ b/Sources/PayPal/Models/Money/DetailedAmount.swift
@@ -2,22 +2,15 @@ import Vapor
 import Core
 
 /// The amount of a purchase which includes details such as shipping, tax, discounts, etc.
-public struct DetailedAmount: Content, ValidationSetable, Equatable {
+public struct DetailedAmount: Content, Equatable {
     
-    /// The [three-character ISO-4217 currency code](https://developer.paypal.com/docs/integration/direct/rest/currency-codes/).
-    /// PayPal does not support all currencies.
-    public var currency: Currency
-    
-    /// The total amount charged to the payee by the payer.
+    /// The currency and amount information for the intance.
     ///
-    /// This property can be set using the `DetailedAmount.set(_:)`.
-    /// This method validates the new value before assigning it to the property.
+    /// The amount's `value` property is the total amount charged to the payee by the payer.
     ///
-    /// For refunds, represents the amount that the payee refunds to the original payer. Maximum length is 10 characters, which includes:
-    /// - Seven digits before the decimal point.
-    /// - The decimal point.
-    /// - Two digits after the decimal point.
-    public private(set) var total: String
+    /// The proprties of this property (`value` and `currency`) are encoded/decoded inline with
+    /// the rest of this type's properties. The coding-key for `value` is `total`.
+    public var amount: CurrencyAmount
     
     /// The additional details about the payment amount.
     public var details: Detail?
@@ -29,146 +22,151 @@ public struct DetailedAmount: Content, ValidationSetable, Equatable {
     ///   - currency: The three-character ISO-4217 currency code
     ///   - total: The total amount charged to the payee by the payer.
     ///   - details: The additional details about the payment amount.
-    public init(currency: Currency, total: String, details: Detail?)throws {
-        self.currency = currency
-        self.total = total
+    public init(currency: Currency, total: Decimal, details: Detail?) {
+        self.amount = CurrencyAmount(currency: currency, value: total)
         self.details = details
-        
-        try self.set(\.total <~ total)
     }
     
     /// See [`Decodable.init(from:)`](https://developer.apple.com/documentation/swift/decodable/2894081-init).
     public init(from decoder: Decoder)throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
-        try self.init(
-            currency: container.decode(Currency.self, forKey: .currency),
-            total: container.decode(String.self, forKey: .total),
-            details: container.decodeIfPresent(Detail.self, forKey: .details)
+        
+        self.details = try container.decodeIfPresent(Detail.self, forKey: .details)
+        self.amount = CurrencyAmount(
+            currency: try container.decode(Currency.self, forKey: .currency),
+            value: try Detail.decimal(from: container.decode(String.self, forKey: .total))
         )
     }
     
-    /// See `ValidationSetable.setterValidations()`.
-    public func setterValidations() -> SetterValidations<DetailedAmount> {
-        var validations = SetterValidations(DetailedAmount.self)
-        
-        validations.set(\.total) { total in
-            guard total.range(of: "^[0-9]{0,7}(\\.[0-9]{1,2})?$", options: .regularExpression) != nil else {
-                throw PayPalError(
-                    status: .badRequest, identifier: "malformedString", reason: "`total` value must match RegEx pattern '^[0-9]{0,7}(\\.[0-9]{1,2})?$'"
-                )
-            }
-        }
-        
-        return validations
+    /// See [`Encodable.encode(to:)`](https://developer.apple.com/documentation/swift/encodable/2893603-encode).
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        try container.encode(String(describing: self.amount.value), forKey: .total)
+        try container.encode(self.amount.currency, forKey: .currency)
+        try container.encode(self.details, forKey: .details)
+    }
+    
+    enum CodingKeys: String, CodingKey {
+        case currency, total, details
     }
 }
 
 extension DetailedAmount {
     
     /// The additional details about a payment amount.
-    public struct Detail: Content, ValidationSetable, Equatable {
-        private let regex: String = "^[0-9]{0,7}(\\.[0-9]{1,2})?$"
+    public struct Detail: Content, Equatable {
+        internal static func decimal(from value: String)throws -> Decimal {
+            guard Double(value) != nil, var decimal = Decimal(string: value) else {
+                throw PayPalError(status: .badRequest, identifier: "badValue", reason: "Unable to convert string `\(value)` to a decimal number")
+            }
+            guard decimal < 10_000_000 else {
+                throw PayPalError(status: .badRequest, identifier: "invalidDecimal", reason: "Decimal value must be less than 10,000,000")
+            }
+            
+            var rounded = decimal
+            NSDecimalRound(&rounded, &decimal, 2, .bankers)
+            
+            if value == "9876543.210" {
+                print("value:", value, ", decimal:", decimal, ", rounded:", rounded)
+            }
+            
+            return rounded
+        }
+        
+        internal static func string(from value: Decimal?)throws -> String? {
+            guard var decimal = value else { return nil }
+            guard decimal < 10_000_000 else {
+                throw PayPalError(status: .internalServerError, identifier: "invalidDecimal", reason: "Decimal value must be less than 10,000,000")
+            }
+            
+            var rounded = decimal
+            NSDecimalRound(&rounded, &decimal, 2, .bankers)
+            
+            return String(describing: rounded)
+        }
+        
+        internal static func decimal(from value: String?)throws -> Decimal? {
+            if let string = value { return try self.decimal(from: string) as Decimal } else { return nil }
+        }
         
         /// The subtotal amount for the items.
         ///
-        /// This property can be set using the `DetailedAmount.set(_:)` method.
-        /// This method validates the new value before assigning it to the property.
-        ///
         /// If the request includes line items, this property is **required**. Maximum length is 10 characters, which includes:
         /// - Seven digits before the decimal point.
         /// - The decimal point.
         /// - Two digits after the decimal point.
-        public private(set) var subtotal: String
+        public var subtotal: Decimal
         
         /// The shipping fee.
         ///
-        /// This property can be set using the `DetailedAmount.set(_:)` method.
-        /// This method validates the new value before assigning it to the property.
-        ///
         /// Maximum length is 10 characters, which includes:
         /// - Seven digits before the decimal point.
         /// - The decimal point.
         /// - Two digits after the decimal point.
-        public private(set) var shipping: String?
+        public var shipping: Decimal?
         
         /// The tax.
         ///
-        /// This property can be set using the `DetailedAmount.set(_:)` method.
-        /// This method validates the new value before assigning it to the property.
-        ///
         /// Maximum length is 10 characters, which includes:
         /// - Seven digits before the decimal point.
         /// - The decimal point.
         /// - Two digits after the decimal point.
-        public private(set) var tax: String?
+        public var tax: Decimal?
         
         /// The handling fee.
         ///
-        /// This property can be set using the `DetailedAmount.set(_:)` method.
-        /// This method validates the new value before assigning it to the property.
-        ///
         /// Maximum length is 10 characters, which includes:
         /// - Seven digits before the decimal point.
         /// - The decimal point.
         /// - Two digits after the decimal point.
         /// Supported for the PayPal payment method only.
-        public private(set) var handlingFee: String?
+        public var handlingFee: Decimal?
         
         /// The shipping fee discount.
         ///
-        /// This property can be set using the `DetailedAmount.set(_:)` method.
-        /// This method validates the new value before assigning it to the property.
-        ///
         /// Maximum length is 10 characters, which includes:
         /// - Seven digits before the decimal point.
         /// - The decimal point.
         /// - Two digits after the decimal point.
         /// Supported for the PayPal payment method only.
-        public private(set) var shippingDiscount: String?
+        public var shippingDiscount: Decimal?
         
         /// The insurance fee.
         ///
-        /// This property can be set using the `DetailedAmount.set(_:)` method.
-        /// This method validates the new value before assigning it to the property.
-        ///
         /// Maximum length is 10 characters, which includes:
         /// - Seven digits before the decimal point.
         /// - The decimal point.
         /// - Two digits after the decimal point.
         /// Supported only for the PayPal payment method.
-        public private(set) var insurance: String?
+        public var insurance: Decimal?
         
         /// The gift wrap fee.
         ///
-        /// This property can be set using the `DetailedAmount.set(_:)` method.
-        /// This method validates the new value before assigning it to the property.
-        ///
         /// Maximum length is 10 characters, which includes:
         /// - Seven digits before the decimal point.
         /// - The decimal point.
         /// - Two digits after the decimal point.
-        public private(set) var giftWrap: String?
+        public var giftWrap: Decimal?
         
         /// Creates a new `DetailAmount.Detail` instance.
         ///
-        ///     DetailAmount.Detail(
-        ///         subtotal: "134.56",
-        ///         shipping: "5.69",
-        ///         tax: "13.45",
-        ///         handlingFee: "1.00",
-        ///         shippingDiscount: "5.69",
-        ///         insurance: "10.00",
-        ///         giftWrap: "2.50"
-        ///     )
+        /// - Parameters:
+        ///   - subtotal: The subtotal amount for the items in an item list.
+        ///   - shipping: The shipping fee.
+        ///   - tax: The tax.
+        ///   - handlingFee: The handling fee.
+        ///   - shippingDiscount: The discount for shipping.
+        ///   - insurance: The insurance fee.
+        ///   - giftWrap: The gift wrap fee.
         public init(
-            subtotal: String,
-            shipping: String? = nil,
-            tax: String? = nil,
-            handlingFee: String? = nil,
-            shippingDiscount: String? = nil,
-            insurance: String? = nil,
-            giftWrap: String? = nil
-        )throws {
+            subtotal: Decimal,
+            shipping: Decimal? = nil,
+            tax: Decimal? = nil,
+            handlingFee: Decimal? = nil,
+            shippingDiscount: Decimal? = nil,
+            insurance: Decimal? = nil,
+            giftWrap: Decimal? = nil
+        ) {
             self.subtotal = subtotal
             self.shipping = shipping
             self.tax = tax
@@ -176,81 +174,32 @@ extension DetailedAmount {
             self.shippingDiscount = shippingDiscount
             self.insurance = insurance
             self.giftWrap = giftWrap
-            
-            try self.set(\.subtotal <~ subtotal)
-            try self.set(\.shipping <~ shipping)
-            try self.set(\.tax <~ tax)
-            try self.set(\.handlingFee <~ handlingFee)
-            try self.set(\.shippingDiscount <~ shippingDiscount)
-            try self.set(\.insurance <~ insurance)
-            try self.set(\.giftWrap <~ giftWrap)
         }
         
         /// See [`Decodable.init(from:)`](https://developer.apple.com/documentation/swift/decodable/2894081-init).
         public init(from decoder: Decoder)throws {
             let container = try decoder.container(keyedBy: CodingKeys.self)
-            try self.init(
-                subtotal: container.decode(String.self, forKey: .subtotal),
-                shipping: container.decodeIfPresent(String.self, forKey: .shipping),
-                tax: container.decodeIfPresent(String.self, forKey: .tax),
-                handlingFee: container.decodeIfPresent(String.self, forKey: .handlingFee),
-                shippingDiscount: container.decodeIfPresent(String.self, forKey: .shippingDiscount),
-                insurance: container.decodeIfPresent(String.self, forKey: .insurance),
-                giftWrap: container.decodeIfPresent(String.self, forKey: .giftWrap)
-            )
+            
+            self.subtotal         = try Detail.decimal(from: container.decode(String.self, forKey: .subtotal))
+            self.shipping         = try Detail.decimal(from: container.decodeIfPresent(String.self, forKey: .shipping))
+            self.tax              = try Detail.decimal(from: container.decodeIfPresent(String.self, forKey: .tax))
+            self.handlingFee      = try Detail.decimal(from: container.decodeIfPresent(String.self, forKey: .handlingFee))
+            self.shippingDiscount = try Detail.decimal(from: container.decodeIfPresent(String.self, forKey: .shippingDiscount))
+            self.insurance        = try Detail.decimal(from: container.decodeIfPresent(String.self, forKey: .insurance))
+            self.giftWrap         = try Detail.decimal(from: container.decodeIfPresent(String.self, forKey: .giftWrap))
         }
         
-        /// See `ValidationSetable.setterValidations()`.
-        public func setterValidations() -> SetterValidations<DetailedAmount.Detail> {
-            var validations = SetterValidations(Detail.self)
-            
-            validations.set(\.subtotal) { subtotal in
-                guard subtotal.range(of: self.regex, options: .regularExpression) != nil else {
-                    throw PayPalError(status: .badRequest, identifier: "malformedString", reason: "`subtotal` value must match RegEx pattern '\(self.regex)`")
-                }
-            }
-            validations.set(\.shipping) { shipping in
-                guard let shipping = shipping else { return }
-                guard shipping.range(of: self.regex, options: .regularExpression) != nil else {
-                    throw PayPalError(status: .badRequest, identifier: "malformedString", reason: "`shipping` value must match RegEx pattern '\(self.regex)`")
-                }
-            }
-            validations.set(\.tax) { tax in
-                guard let tax = tax else { return }
-                guard tax.range(of: self.regex, options: .regularExpression) != nil else {
-                    throw PayPalError(status: .badRequest, identifier: "malformedString", reason: "`tax` value must match RegEx pattern '\(self.regex)`")
-                }
-            }
-            validations.set(\.handlingFee) { handlingFee in
-                guard let handlingFee = handlingFee else { return }
-                guard handlingFee.range(of: self.regex, options: .regularExpression) != nil else {
-                    throw PayPalError(status: .badRequest, identifier: "malformedString", reason: "`handlingFee` value must match RegEx pattern '\(self.regex)`")
-                }
-            }
-            validations.set(\.shippingDiscount) { shippingDiscount in
-                guard let shippingDiscount = shippingDiscount else { return }
-                guard shippingDiscount.range(of: self.regex, options: .regularExpression) != nil else {
-                    throw PayPalError(
-                        status: .badRequest,
-                        identifier: "malformedString",
-                        reason: "`shippingDiscount` value must match RegEx pattern '\(self.regex)`"
-                    )
-                }
-            }
-            validations.set(\.insurance) { insurance in
-                guard let insurance = insurance else { return }
-                guard insurance.range(of: self.regex, options: .regularExpression) != nil else {
-                    throw PayPalError(status: .badRequest, identifier: "malformedString", reason: "`insurance` value must match RegEx pattern '\(self.regex)`")
-                }
-            }
-            validations.set(\.giftWrap) { giftWrap in
-                guard let giftWrap = giftWrap else { return }
-                guard giftWrap.range(of: self.regex, options: .regularExpression) != nil else {
-                    throw PayPalError(status: .badRequest, identifier: "malformedString", reason: "`giftWrap` value must match RegEx pattern '\(self.regex)`")
-                }
-            }
-            
-            return validations
+        /// See [`Encodable.encode(to:)`](https://developer.apple.com/documentation/swift/encodable/2893603-encode).
+        public func encode(to encoder: Encoder)throws {
+            var container = encoder.container(keyedBy: CodingKeys.self)
+
+            if let value = try Detail.string(from: self.subtotal)         { try container.encode(value, forKey: .subtotal) }
+            if let value = try Detail.string(from: self.shipping)         { try container.encode(value, forKey: .shipping) }
+            if let value = try Detail.string(from: self.tax)              { try container.encode(value, forKey: .tax) }
+            if let value = try Detail.string(from: self.handlingFee)      { try container.encode(value, forKey: .handlingFee) }
+            if let value = try Detail.string(from: self.shippingDiscount) { try container.encode(value, forKey: .shippingDiscount) }
+            if let value = try Detail.string(from: self.insurance)        { try container.encode(value, forKey: .insurance) }
+            if let value = try Detail.string(from: self.giftWrap)         { try container.encode(value, forKey: .giftWrap) }
         }
         
         enum CodingKeys: String, CodingKey {
diff --git a/Sources/PayPal/Models/Money/Money.swift b/Sources/PayPal/Models/Money/Money.swift
deleted file mode 100644
index 6cdabf23..00000000
--- a/Sources/PayPal/Models/Money/Money.swift
+++ /dev/null
@@ -1,144 +0,0 @@
-import Vapor
-
-internal let moneyValuePattern = "^((-?[0-9]+)|(-?([0-9]+)?[.][0-9]+))$"
-
-/// An amount of a specified currency.
-public protocol Monitary: Content, ValidationSetable, Equatable {
-    
-    /// The coding keys used for encoding/decoding the object.
-    associatedtype CodingKeys: CodingKey
-    
-    /// The key path to use in validation of the `.value` property.
-    static var valueKey: WritableKeyPath<Self, String> { get }
-    
-    /// The currency that the `Money` instance represents.
-    var currency: Currency { get set }
-    
-    /// The amount of the currency that the class instance represents.
-    ///
-    /// The value, which might be:
-    /// - An integer for currencies like JPY that are not typically fractional.
-    /// - A decimal fraction for currencies like TND that are subdivided into thousandths.
-    /// For the required number of decimal places for a currency code, see [Currency codes - ISO 4217](https://www.iso.org/iso-4217-currency-codes.html).
-    ///
-    /// This property should be set using the `Money.set(_:)` method, which will validate the new value
-    /// before assigning it to the property.
-    ///
-    /// Maximum length is 32, and is must match this RegEx pattern `^((-?[0-9]+)|(-?([0-9]+)?[.][0-9]+))$`.
-    var value: String { get set }
-    
-    /// Creates a new `Money` instance.
-    ///
-    ///     try Money(code: "USD", value: "12.25")
-    ///
-    /// - Parameters:
-    ///   - code: The code for the currency of the money.
-    ///   - value: The amount of the currency to represent.
-    ///
-    /// - Throws: `Abort(.badRequest, "Attempted to use malformed mony amount value '{value}'")`
-    init(currency: Currency, value: String)throws
-}
-
-extension Monitary {
-    
-    /// Compares two `Money` objects, checking that the `currency`
-    /// and `value` properties are equal.
-    public static func == (lhs: Self, rhs: Self) -> Bool {
-        return (lhs.currency == rhs.currency) && (lhs.value == rhs.value)
-    }
-    
-    /// See `ValidationSetable.setterValidations()`
-    public func setterValidations() -> SetterValidations<Self> {
-        var validations = SetterValidations(Self.self)
-        validations.set(Self.valueKey) { value in
-            guard
-                value.range(of: moneyValuePattern, options: .regularExpression, range: nil, locale: nil) != nil &&
-                value.count <= 32
-            else {
-                throw Abort(.badRequest, reason: "Attempted to use malformed money amount value '\(value)'")
-            }
-        }
-        return validations
-    }
-}
-
-/// An amount of a specified currency.
-///
-/// Uses `currency_code` as the `currency` property coding key.
-public struct Money: Monitary {
-    
-    /// See `Money.valueKey`.
-    public static var valueKey: WritableKeyPath<Money, String> = \.value
-    
-    /// See `Monitary.currency`.
-    public var currency: Currency
-    
-    /// See `Monitary.value`.
-    public var value: String
-    
-    /// See `Monitary.init(currency:value:)`.
-    public init(currency: Currency, value: String)throws {
-        self.currency = currency
-        self.value = value
-        
-        try self.set(\.value <~ value)
-    }
-    
-    /// Creates a `Money` instance from the data container in a decoder's keyed container.
-    ///
-    /// This initializer uses the validations of the main `init(code:value:)` method.
-    public init(from decoder: Decoder)throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        try self.init(
-            currency: container.decode(Currency.self, forKey: .currency),
-            value: container.decode(String.self, forKey: .value)
-        )
-    }
-    
-    /// See `Monitary.CodingKeys`.
-    public enum CodingKeys: String, CodingKey {
-        case value
-        case currency = "currency_code"
-    }
-}
-
-/// An amount of a specified currency.
-///
-/// Uses `currency` as the `currency` property coding key.
-public struct Amount: Monitary {
-
-    /// See `Amount.valueKey`.
-    public static var valueKey: WritableKeyPath<Amount, String> = \.value
-    
-    /// See `Monitary.currency`.
-    public var currency: Currency
-    
-    /// See `Monitary.value`.
-    public var value: String
-    
-    /// See `Monitary.init(currency:value:)`.
-    public init(currency: Currency, value: String)throws {
-        self.currency = currency
-        self.value = value
-        
-        try self.set(\.value <~ value)
-    }
-    
-    /// Creates a `Money` instance from the data container in a decoder's keyed container.
-    ///
-    /// This initializer uses the validations of the main `init(code:value:)` method.
-    public init(from decoder: Decoder)throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        
-        try self.init(
-            currency: container.decode(Currency.self, forKey: .currency),
-            value: container.decode(String.self, forKey: .value)
-        )
-    }
-    
-    /// See `Monitary.CodingKeys`.
-    public enum CodingKeys: String, CodingKey {
-        case value
-        case currency = "currency"
-    }
-}
diff --git a/Sources/PayPal/Models/Money/MoneyRange.swift b/Sources/PayPal/Models/Money/MoneyRange.swift
index 31669758..ec7c789d 100644
--- a/Sources/PayPal/Models/Money/MoneyRange.swift
+++ b/Sources/PayPal/Models/Money/MoneyRange.swift
@@ -1,7 +1,7 @@
 import Vapor
 
 /// A range of amounts between two
-public struct MoneyRange<M>: Content, Equatable where M: Monitary {
+public struct MoneyRange<M>: Content, Equatable where M: Amount {
     
     /// The minimum inclusive value of the range.
     public var minimum: M
@@ -20,9 +20,9 @@ public struct MoneyRange<M>: Content, Equatable where M: Monitary {
     /// Creates a new `MoneyRange` instance.
     ///
     ///     MoneyRange("12.25"..."50.00", currency: .usd)
-    public init(_ values: ClosedRange<String>, currency: Currency)throws {
-        try self.minimum = M(currency: currency, value: values.lowerBound)
-        try self.maximum = M(currency: currency, value: values.upperBound)
+    public init(_ values: ClosedRange<Decimal>, currency: Currency) {
+        self.minimum = M(currency: currency, value: values.lowerBound)
+        self.maximum = M(currency: currency, value: values.upperBound)
     }
     
     enum CodingKeys: String, CodingKey {
diff --git a/Sources/PayPal/Models/Order/Order.swift b/Sources/PayPal/Models/Order/Order.swift
index 9d527d9c..be055c2c 100644
--- a/Sources/PayPal/Models/Order/Order.swift
+++ b/Sources/PayPal/Models/Order/Order.swift
@@ -31,7 +31,7 @@ public struct Order: Content, Equatable {
     public var payment: Payment?
     
     /// The currency and amount of the PayPal-computed total of amounts in all purchase units.
-    public var total: Amount?
+    public var total: CurrencyAmount?
     
     /// Customizes the payer experience during the approval process for the payment with PayPal.
     public var context: AppContext?
@@ -57,7 +57,7 @@ public struct Order: Content, Equatable {
         intent: Intent?,
         units: [Unit]?,
         payment: Payment?,
-        total: Amount?,
+        total: CurrencyAmount?,
         context: AppContext?,
         metadata: Metadata?,
         redirects: Redirects?
diff --git a/Sources/PayPal/Models/Order/Payee/PartnerFee.swift b/Sources/PayPal/Models/Order/Payee/PartnerFee.swift
index 7f13458a..72f24ef3 100644
--- a/Sources/PayPal/Models/Order/Payee/PartnerFee.swift
+++ b/Sources/PayPal/Models/Order/Payee/PartnerFee.swift
@@ -7,14 +7,14 @@ public struct PartnerFee: Content, Equatable {
     public var receiver: Payee
     
     /// The amount and currency of the partner fee.
-    public var amount: Amount
+    public var amount: CurrencyAmount
     
     /// Creates a new `PartnerFee` instance.
     ///
     /// - Parameters:
     ///   - receiver: The partner who receives the partner fee.
     ///   - amount: The amount and currency of the partner fee.
-    public init(receiver: Payee, amount: Amount) {
+    public init(receiver: Payee, amount: CurrencyAmount) {
         self.receiver = receiver
         self.amount = amount
     }
diff --git a/Sources/PayPal/Models/Order/Payment/Capture.swift b/Sources/PayPal/Models/Order/Payment/Capture.swift
index e7b23417..5a6d36ff 100644
--- a/Sources/PayPal/Models/Order/Payment/Capture.swift
+++ b/Sources/PayPal/Models/Order/Payment/Capture.swift
@@ -22,7 +22,7 @@ public struct Capture: Content, Equatable {
     public var amount: DetailedAmount?
     
     /// The currency and amount of the transaction fee
-    public var transaction: Amount?
+    public var transaction: CurrencyAmount?
     
     
     /// Creates a new `Capture` instance.
@@ -32,7 +32,7 @@ public struct Capture: Content, Equatable {
     ///   - transaction: The currency and amount of the transaction fee.
     public init(
         amount: DetailedAmount?,
-        transaction: Amount?
+        transaction: CurrencyAmount?
     ) {
         self.id = nil
         self.links = nil
diff --git a/Sources/PayPal/Models/Order/Payment/Sale.swift b/Sources/PayPal/Models/Order/Payment/Sale.swift
index 2b80841d..706a578f 100644
--- a/Sources/PayPal/Models/Order/Payment/Sale.swift
+++ b/Sources/PayPal/Models/Order/Payment/Sale.swift
@@ -29,7 +29,7 @@ public struct Sale: Content, Equatable {
     /// - Seven digits before the decimal point.
     /// - The decimal point.
     /// - Two digits after the decimal point.
-    public var transaction: Amount?
+    public var transaction: CurrencyAmount?
     
     
     /// Creates a new `Sale` instance.
@@ -37,7 +37,7 @@ public struct Sale: Content, Equatable {
     /// - Parameters:
     ///   - amount: The amount to collect.
     ///   - transaction: The currency and amount of the transaction fee.
-    public init(amount: DetailedAmount?, transaction: Amount?) {
+    public init(amount: DetailedAmount?, transaction: CurrencyAmount?) {
         self.id = nil
         self.status = nil
         self.created = nil
diff --git a/Sources/PayPal/Models/Payer.swift b/Sources/PayPal/Models/Payer/Payer.swift
similarity index 100%
rename from Sources/PayPal/Models/Payer.swift
rename to Sources/PayPal/Models/Payer/Payer.swift
diff --git a/Sources/PayPal/Models/PayerInfo.swift b/Sources/PayPal/Models/Payer/PayerInfo.swift
similarity index 100%
rename from Sources/PayPal/Models/PayerInfo.swift
rename to Sources/PayPal/Models/Payer/PayerInfo.swift
diff --git a/Sources/PayPal/Models/Payer/PaymentPayerInfo.swift b/Sources/PayPal/Models/Payer/PaymentPayerInfo.swift
index 2d9d8f2c..f6f076d6 100644
--- a/Sources/PayPal/Models/Payer/PaymentPayerInfo.swift
+++ b/Sources/PayPal/Models/Payer/PaymentPayerInfo.swift
@@ -45,10 +45,7 @@ extension Order.Payer {
         public var taxType: TaxType?
         
         /// The payer's [two-character IS0-3166-1 country code](https://developer.paypal.com/docs/integration/direct/rest/country-codes/).
-        ///
-        /// This property can be set using the `Inof.set(_:)` method.
-        /// This method validates the new value before assigning it to the property.
-        public private(set) var country: String?
+        public var country: Country?
         
         /// The payer's billing address.
         public var billing: Address?
@@ -68,7 +65,7 @@ extension Order.Payer {
             birthdate: String?,
             tax: String?,
             taxType: TaxType?,
-            country: String?,
+            country: Country?,
             billing: Address?
         )throws {
             self.salutation = nil
@@ -87,7 +84,6 @@ extension Order.Payer {
             
             try self.set(\.email <~ email)
             try self.set(\.tax <~ tax)
-            try self.set(\.country <~ country)
         }
         
         /// See [`Decodable.init(from:)`](https://developer.apple.com/documentation/swift/decodable/2894081-init).
@@ -104,12 +100,11 @@ extension Order.Payer {
             self.birthdate = try container.decodeIfPresent(String.self, forKey: .birthdate)
             self.tax = try container.decodeIfPresent(String.self, forKey: .tax)
             self.taxType = try container.decodeIfPresent(TaxType.self, forKey: .taxType)
-            self.country = try container.decodeIfPresent(String.self, forKey: .country)
+            self.country = try container.decodeIfPresent(Country.self, forKey: .country)
             self.billing = try container.decodeIfPresent(Address.self, forKey: .billing)
             
             try self.set(\.email <~ email)
             try self.set(\.tax <~ tax)
-            try self.set(\.country <~ country)
         }
         
         /// See `ValidationSetable.setterValidations()`.
@@ -126,12 +121,6 @@ extension Order.Payer {
                     throw PayPalError(status: .badRequest, identifier: "invalidLength", reason: "`tax_id` value must have a length of 14 or less")
                 }
             }
-            validations.set(\.country) { country in
-                guard let country = country else { return }
-                guard country.range(of: "^([A-Z]{2}|C2)$", options: .regularExpression) != nil else {
-                    throw PayPalError(status: .badRequest, identifier: "malformedString", reason: "`country` value must match RegEx pattern `^([A-Z]{2}|C2)$`")
-                }
-            }
             
             return validations
         }
diff --git a/Sources/PayPal/Models/PaymentDetails/Metadata.swift b/Sources/PayPal/Models/Payment/Details/Metadata.swift
similarity index 100%
rename from Sources/PayPal/Models/PaymentDetails/Metadata.swift
rename to Sources/PayPal/Models/Payment/Details/Metadata.swift
diff --git a/Sources/PayPal/Models/PaymentDetails/PaymentDetail.swift b/Sources/PayPal/Models/Payment/Details/PaymentDetail.swift
similarity index 96%
rename from Sources/PayPal/Models/PaymentDetails/PaymentDetail.swift
rename to Sources/PayPal/Models/Payment/Details/PaymentDetail.swift
index 43396f57..6a976cb2 100644
--- a/Sources/PayPal/Models/PaymentDetails/PaymentDetail.swift
+++ b/Sources/PayPal/Models/Payment/Details/PaymentDetail.swift
@@ -25,13 +25,13 @@ public struct PaymentDetail: Content, Equatable {
     
     /// The payment amount to record against the invoice. If you omit this parameter,
     /// the total invoice amount is marked as paid. This amount cannot exceed the amount due.
-    public var amount: Amount?
+    public var amount: CurrencyAmount?
     
     
     /// Creates a new `PaymentDetail` instance.
     ///
     ///     PaymentDetail(date: Date().iso8601, method: .cash, note: "Hello World", amount: Amount(currency: .usd, value: "4.50"))
-    public init(date: String?, method: Method, note: String?, amount: Amount?) {
+    public init(date: String?, method: Method, note: String?, amount: CurrencyAmount?) {
         self.type = nil
         self.transaction = nil
         self.transactionType = nil
diff --git a/Sources/PayPal/Models/PaymentDetails/PaymentDetailMethod.swift b/Sources/PayPal/Models/Payment/Details/PaymentDetailMethod.swift
similarity index 100%
rename from Sources/PayPal/Models/PaymentDetails/PaymentDetailMethod.swift
rename to Sources/PayPal/Models/Payment/Details/PaymentDetailMethod.swift
diff --git a/Sources/PayPal/Models/PaymentDetails/PaymentDetailType.swift b/Sources/PayPal/Models/Payment/Details/PaymentDetailType.swift
similarity index 100%
rename from Sources/PayPal/Models/PaymentDetails/PaymentDetailType.swift
rename to Sources/PayPal/Models/Payment/Details/PaymentDetailType.swift
diff --git a/Sources/PayPal/Models/PaymentDetails/PaymentMethod.swift b/Sources/PayPal/Models/Payment/Details/PaymentMethod.swift
similarity index 100%
rename from Sources/PayPal/Models/PaymentDetails/PaymentMethod.swift
rename to Sources/PayPal/Models/Payment/Details/PaymentMethod.swift
diff --git a/Sources/PayPal/Models/PaymentDetails/PaymentReceivingPreferences.swift b/Sources/PayPal/Models/Payment/Details/PaymentReceivingPreferences.swift
similarity index 100%
rename from Sources/PayPal/Models/PaymentDetails/PaymentReceivingPreferences.swift
rename to Sources/PayPal/Models/Payment/Details/PaymentReceivingPreferences.swift
diff --git a/Sources/PayPal/Models/PaymentDetails/PaymentSummary.swift b/Sources/PayPal/Models/Payment/Details/PaymentSummary.swift
similarity index 78%
rename from Sources/PayPal/Models/PaymentDetails/PaymentSummary.swift
rename to Sources/PayPal/Models/Payment/Details/PaymentSummary.swift
index 2a68aebd..a39931d0 100644
--- a/Sources/PayPal/Models/PaymentDetails/PaymentSummary.swift
+++ b/Sources/PayPal/Models/Payment/Details/PaymentSummary.swift
@@ -4,8 +4,8 @@ import Vapor
 public struct PaymentSummary: Content, Equatable {
     
     /// The currency and amount of the total paid or refunded through PayPal.
-    public let paypal: Amount?
+    public let paypal: CurrencyAmount?
     
     /// The currency and amount of the total paid or refunded through other sources.
-    public let other: Amount?
+    public let other: CurrencyAmount?
 }
diff --git a/Sources/PayPal/Models/PaymentDetails/PaymentTerm.swift b/Sources/PayPal/Models/Payment/Details/PaymentTerm.swift
similarity index 100%
rename from Sources/PayPal/Models/PaymentDetails/PaymentTerm.swift
rename to Sources/PayPal/Models/Payment/Details/PaymentTerm.swift
diff --git a/Sources/PayPal/Models/PaymentDetails/PaymentTransactionType.swift b/Sources/PayPal/Models/Payment/Details/PaymentTransactionType.swift
similarity index 100%
rename from Sources/PayPal/Models/PaymentDetails/PaymentTransactionType.swift
rename to Sources/PayPal/Models/Payment/Details/PaymentTransactionType.swift
diff --git a/Sources/PayPal/Models/PaymentDetails/PaymentType.swift b/Sources/PayPal/Models/Payment/Details/PaymentType.swift
similarity index 100%
rename from Sources/PayPal/Models/PaymentDetails/PaymentType.swift
rename to Sources/PayPal/Models/Payment/Details/PaymentType.swift
diff --git a/Sources/PayPal/Models/PaymentDetails/RefundDetails.swift b/Sources/PayPal/Models/Payment/Details/RefundDetails.swift
similarity index 92%
rename from Sources/PayPal/Models/PaymentDetails/RefundDetails.swift
rename to Sources/PayPal/Models/Payment/Details/RefundDetails.swift
index 9ebfd17f..4ed77098 100644
--- a/Sources/PayPal/Models/PaymentDetails/RefundDetails.swift
+++ b/Sources/PayPal/Models/Payment/Details/RefundDetails.swift
@@ -18,13 +18,13 @@ public struct RefundDetail: Content, Equatable {
     public var note: String?
     
     /// The currency and amount to record as refunded. If you omit the amount, the total invoice paid amount is recorded as refunded.
-    public var amount: Amount?
+    public var amount: CurrencyAmount?
     
     
     /// Creates a new `RefundDetail` instance.
     ///
     ///     RefundDetail(date: Date().iso8601, note: "Hello World", amount: Amount(currency: .usd, value: "4.50"))
-    public init(date: String?, note: String?, amount: Amount?) {
+    public init(date: String?, note: String?, amount: CurrencyAmount?) {
         self.type = nil
         self.transaction = nil
         
diff --git a/Sources/PayPal/Models/Payment/Resources/ResourceCapture.swift b/Sources/PayPal/Models/Payment/Resources/ResourceCapture.swift
index 62e19be9..e12e8723 100644
--- a/Sources/PayPal/Models/Payment/Resources/ResourceCapture.swift
+++ b/Sources/PayPal/Models/Payment/Resources/ResourceCapture.swift
@@ -43,7 +43,7 @@ extension RelatedResource {
         public private(set) var invoice: String?
         
         /// The currency and amount of the transaction fee for this payment.
-        public var transaction: Amount?
+        public var transaction: CurrencyAmount?
         
         /// A free-form field that clients can use to send a note to the payer.
         ///
@@ -62,7 +62,7 @@ extension RelatedResource {
         ///   - invoice: The invoice number to track this payment.
         ///   - transaction: The currency and amount of the transaction fee for this payment.
         ///   - payerNote: A free-form field that clients can use to send a note to the payer.
-        public init(amount: DetailedAmount?, isFinal: Bool?, invoice: String?, transaction: Amount?, payerNote: String?)throws {
+        public init(amount: DetailedAmount?, isFinal: Bool?, invoice: String?, transaction: CurrencyAmount?, payerNote: String?)throws {
             self.id = nil
             self.state = nil
             self.reason = nil
@@ -94,7 +94,7 @@ extension RelatedResource {
             self.amount = try container.decodeIfPresent(DetailedAmount.self, forKey: .amount)
             self.isFinal = try container.decodeIfPresent(Bool.self, forKey: .isFinal)
             self.invoice = try container.decodeIfPresent(String.self, forKey: .invoice)
-            self.transaction = try container.decodeIfPresent(Amount.self, forKey: .transaction)
+            self.transaction = try container.decodeIfPresent(CurrencyAmount.self, forKey: .transaction)
             self.payerNote = try container.decodeIfPresent(String.self, forKey: .payerNote)
             
             try self.set(\.invoice <~ invoice)
diff --git a/Sources/PayPal/Models/Payment/Resources/ResourceSale.swift b/Sources/PayPal/Models/Payment/Resources/ResourceSale.swift
index 5d5bf677..871fc52c 100644
--- a/Sources/PayPal/Models/Payment/Resources/ResourceSale.swift
+++ b/Sources/PayPal/Models/Payment/Resources/ResourceSale.swift
@@ -62,11 +62,11 @@ extension RelatedResource {
         public var amount: DetailedAmount
         
         /// The currency and amount of the transaction fee.
-        public var transaction: Amount?
+        public var transaction: CurrencyAmount?
         
         /// The currency and amount of the net that the merchant receives for this transaction in their receivable currency.
         /// Returned only in cross-currency use cases where a merchant bills a buyer in a non-primary currency for that buyer.
-        public var receivable: Amount?
+        public var receivable: CurrencyAmount?
         
         /// The exchange rate for this transaction. Returned only in cross-currency use cases where a merchant bills
         /// a buyer in a non-primary currency for that buyer.
@@ -98,8 +98,8 @@ extension RelatedResource {
             id: String,
             amount: DetailedAmount,
             state: State,
-            transaction: Amount? = nil,
-            receivable: Amount? = nil,
+            transaction: CurrencyAmount? = nil,
+            receivable: CurrencyAmount? = nil,
             exchangeRate: String? = nil,
             fmf: FraudManagementFilter? = nil,
             processor: ProcessorResponse? = nil,
diff --git a/Sources/PayPal/Models/Payment/Response/PaymentRefundResult.swift b/Sources/PayPal/Models/Payment/Response/PaymentRefundResult.swift
index 8c0f4aac..f68afe90 100644
--- a/Sources/PayPal/Models/Payment/Response/PaymentRefundResult.swift
+++ b/Sources/PayPal/Models/Payment/Response/PaymentRefundResult.swift
@@ -53,16 +53,16 @@ extension Payment {
         public var custom: String?
         
         /// The currency and amount of the transaction fee that is refunded to original the recipient of payment.
-        public var transactionFee: Amount?
+        public var transactionFee: CurrencyAmount?
         
         /// The currency and amount of the refund that is subtracted from the original payment recipient's PayPal balance.
-        public var received: Amount?
+        public var received: CurrencyAmount?
         
         /// The currency and amount of the total refund from the original purchase.
         ///
         /// As an example, if a payer makes $100 purchase and the payer was refunded $20 a week ago and $30 in this transaction,
         /// the gross refund amount is $30 for this transaction and the total refunded amount is $50.
-        public var total: Amount?
+        public var total: CurrencyAmount?
         
         
         /// See `ValidationSetable.setterValidations()`.
diff --git a/Sources/PayPal/Models/PhoneNumber/DisplayPhone.swift b/Sources/PayPal/Models/PhoneNumber/DisplayPhone.swift
index 3eaa45f2..1156401c 100644
--- a/Sources/PayPal/Models/PhoneNumber/DisplayPhone.swift
+++ b/Sources/PayPal/Models/PhoneNumber/DisplayPhone.swift
@@ -1,13 +1,10 @@
 import Vapor
 
 /// A country specific phone number.
-public struct DisplayPhone: Content, ValidationSetable, Equatable {
+public struct DisplayPhone: Content, Equatable {
     
     /// The [two-character IS0-3166-1 country code](https://developer.paypal.com/docs/integration/direct/rest/country-codes/) of the payee's country.
-    ///
-    /// This property can be set using the `DisplayPhone.set(_:)` method.
-    /// This method validates the new value before assigning it to the property.
-    public private(set) var country: String?
+    public var country: Country?
     
     /// The in-country phone number, in [E.164 numbering plan format](https://www.itu.int/rec/T-REC-E.164-201011-I).
     public var number: String?
@@ -17,34 +14,9 @@ public struct DisplayPhone: Content, ValidationSetable, Equatable {
     /// - Parameters:
     ///   - country: The country code of the payee's country.
     ///   - number: The in-country phone number.
-    public init(country: String?, number: String?)throws {
+    public init(country: Country?, number: String?) {
         self.country = country
         self.number = number
-        
-        try self.set(\.country <~ country)
-    }
-    
-    /// See [`Decodable.init(from:)`](https://developer.apple.com/documentation/swift/decodable/2894081-init).
-    public init(from decoder: Decoder)throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        try self.init(
-            country: container.decodeIfPresent(String.self, forKey: .country),
-            number: container.decodeIfPresent(String.self, forKey: .number)
-        )
-    }
-    
-    /// See `ValidationSetable.setterValidations()`.
-    public func setterValidations() -> SetterValidations<DisplayPhone> {
-        var validations = SetterValidations(DisplayPhone.self)
-        
-        validations.set(\.country) { country in
-            guard let country = country else { return }
-            guard country.range(of: "^([A-Z]{2}|C2)$", options: .regularExpression) != nil else {
-                throw PayPalError(status: .badRequest, identifier: "malformedString", reason: "`country` value must match RegEx pattern '^([A-Z]{2}|C2)$'")
-            }
-        }
-        
-        return validations
     }
     
     enum CodingKeys: String, CodingKey {
diff --git a/Sources/PayPal/Models/PlaceOfBirth.swift b/Sources/PayPal/Models/PlaceOfBirth.swift
index 1c971ead..3b196542 100644
--- a/Sources/PayPal/Models/PlaceOfBirth.swift
+++ b/Sources/PayPal/Models/PlaceOfBirth.swift
@@ -1,18 +1,15 @@
 import Vapor
 
 /// The birthplace of a human, robot, orangutang, or anything else that originates on planet earth.
-public struct BirthPlace: Content, ValidationSetable, Equatable {
+public struct BirthPlace: Content, Equatable {
     
     /// The two-character ISO 3166-1 code that identifies the country or region.
     ///
     /// - Note: he country code for Great Britain is `GB` and not `UK` as used in the top-level domain names for that country.
     ///   Use the `C2` country code for China worldwide for comparable uncontrolled price (CUP) method, bank card, and cross-border transactions.
     ///
-    /// This property can be set using the `BirthPlace.set(_:)` method. This method
-    /// validates the new value before assigning it to the property.
-    ///
     /// Length: 2. Pattern: `^([A-Z]{2}|C2)$`.
-    public private(set) var country: String?
+    public var country: Country?
     
     /// The city of birth.
     public var city: String?
@@ -20,26 +17,12 @@ public struct BirthPlace: Content, ValidationSetable, Equatable {
     
     /// Creates a new `BirthPlace` instance.
     ///
-    ///     BirthPlace(country: "US", city: "Seattle")
-    public init(country: String?, city: String?)throws {
+    ///     BirthPlace(country: .unitedStates, city: "Seattle")
+    public init(country: Country?, city: String?) {
         self.country = country
         self.city = city
     }
     
-    /// See `ValidationSetable.setterValidations()`.
-    public func setterValidations() -> SetterValidations<BirthPlace> {
-        var validations = SetterValidations(BirthPlace.self)
-        
-        validations.set(\.country) { country in
-            guard let country = country else { return }
-            guard country.range(of: "^([A-Z]{2}|C2)$", options: .regularExpression) != nil else {
-                throw PayPalError(status: .badRequest, identifier: "malformedString", reason: "`country` value must match RegEx pattern `^([A-Z]{2}|C2)$`")
-            }
-        }
-        
-        return validations
-    }
-    
     enum CodingKeys: String, CodingKey {
         case country = "country_code"
         case city
diff --git a/Sources/PayPal/Models/Province.swift b/Sources/PayPal/Models/Province.swift
new file mode 100644
index 00000000..38a516b6
--- /dev/null
+++ b/Sources/PayPal/Models/Province.swift
@@ -0,0 +1,1364 @@
+import Vapor
+
+/// Valid state and province codes for countries supported by PayPal.
+public enum Province: String, Hashable, CaseIterable, Content {
+
+    /// `CIUDAD AUTÓNOMA DE BUENOS AIRES`
+    case ciudadAutónomaDeBuenosAires = "CIUDAD AUTÓNOMA DE BUENOS AIRES"
+    
+    /// `BUENOS AIRES`
+    case buenosAires = "BUENOS AIRES"
+    
+    /// `CATAMARCA`
+    case catamarca = "CATAMARCA"
+    
+    /// `CHACO`
+    case chaco = "CHACO"
+    
+    /// `CHUBUT`
+    case chubut = "CHUBUT"
+    
+    /// `CORRIENTES`
+    case corrientes = "CORRIENTES"
+    
+    /// `CÓRDOBA`
+    case córdoba = "CÓRDOBA"
+    
+    /// `ENTRE RÍOS`
+    case entreRíos = "ENTRE RÍOS"
+    
+    /// `FORMOSA`
+    case formosa = "FORMOSA"
+    
+    /// `JUJUY`
+    case jujuy = "JUJUY"
+    
+    /// `LA PAMPA`
+    case laPampa = "LA PAMPA"
+    
+    /// `LA RIOJA`
+    case laRioja = "LA RIOJA"
+    
+    /// `MENDOZA`
+    case mendoza = "MENDOZA"
+    
+    /// `MISIONES`
+    case misiones = "MISIONES"
+    
+    /// `NEUQUÉN`
+    case neuquén = "NEUQUÉN"
+    
+    /// `RÍO NEGRO`
+    case ríoNegro = "RÍO NEGRO"
+    
+    /// `SALTA`
+    case salta = "SALTA"
+    
+    /// `SAN JUAN`
+    case sanJuan = "SAN JUAN"
+    
+    /// `SAN LUIS`
+    case sanLuis = "SAN LUIS"
+    
+    /// `SANTA CRUZ`
+    case santaCruz = "SANTA CRUZ"
+    
+    /// `SANTA FE`
+    case santaFe = "SANTA FE"
+    
+    /// `SANTIAGO DEL ESTERO`
+    case santiagoDelEstero = "SANTIAGO DEL ESTERO"
+    
+    /// `TIERRA DEL FUEGO`
+    case tierraDelFuego = "TIERRA DEL FUEGO"
+    
+    /// `TUCUMÁN`
+    case tucumán = "TUCUMÁN"
+    
+    /// `AC`
+    case ac = "AC"
+    
+    /// `AL`
+    case al = "AL"
+    
+    /// `AP`
+    case ap = "AP"
+    
+    /// `AM`
+    case am = "AM"
+    
+    /// `BA`
+    case ba = "BA"
+    
+    /// `CE`
+    case ce = "CE"
+    
+    /// `DF`
+    case df = "DF"
+    
+    /// `ES`
+    case es = "ES"
+    
+    /// `GO`
+    case go = "GO"
+    
+    /// `MA`
+    case ma = "MA"
+    
+    /// `MT`
+    case mt = "MT"
+    
+    /// `MS`
+    case ms = "MS"
+    
+    /// `MG`
+    case mg = "MG"
+    
+    /// `PR`
+    case pr = "PR"
+    
+    /// `PB`
+    case pb = "PB"
+    
+    /// `PA`
+    case pa = "PA"
+    
+    /// `PE`
+    case pe = "PE"
+    
+    /// `PI`
+    case pi = "PI"
+    
+    /// `RN`
+    case rn = "RN"
+    
+    /// `RS`
+    case rs = "RS"
+    
+    /// `RJ`
+    case rj = "RJ"
+    
+    /// `RO`
+    case ro = "RO"
+    
+    /// `RR`
+    case rr = "RR"
+    
+    /// `SC`
+    case sc = "SC"
+    
+    /// `SE`
+    case se = "SE"
+    
+    /// `SP`
+    case sp = "SP"
+    
+    /// `TO`
+    case to = "TO"
+    
+    /// `AB`
+    case ab = "AB"
+    
+    /// `BC`
+    case bc = "BC"
+    
+    /// `MB`
+    case mb = "MB"
+    
+    /// `NB`
+    case nb = "NB"
+    
+    /// `NL`
+    case nl = "NL"
+    
+    /// `NT`
+    case nt = "NT"
+    
+    /// `NS`
+    case ns = "NS"
+    
+    /// `NU`
+    case nu = "NU"
+    
+    /// `ON`
+    case on = "ON"
+    
+    /// `QC`
+    case qc = "QC"
+    
+    /// `SK`
+    case sk = "SK"
+    
+    /// `YT`
+    case yt = "YT"
+    
+    /// `CN-AH`
+    case cnAh = "CN-AH"
+    
+    /// `CN-BJ`
+    case cnBj = "CN-BJ"
+    
+    /// `CN-CQ`
+    case cnCq = "CN-CQ"
+    
+    /// `CN-FJ`
+    case cnFj = "CN-FJ"
+    
+    /// `CN-GD`
+    case cnGd = "CN-GD"
+    
+    /// `CN-GS`
+    case cnGs = "CN-GS"
+    
+    /// `CN-GX`
+    case cnGx = "CN-GX"
+    
+    /// `CN-GZ`
+    case cnGz = "CN-GZ"
+    
+    /// `CN-HA`
+    case cnHa = "CN-HA"
+    
+    /// `CN-HB`
+    case cnHb = "CN-HB"
+    
+    /// `CN-HE`
+    case cnHe = "CN-HE"
+    
+    /// `CN-HI`
+    case cnHi = "CN-HI"
+    
+    /// `CN-HK`
+    case cnHk = "CN-HK"
+    
+    /// `CN-HL`
+    case cnHl = "CN-HL"
+    
+    /// `CN-HN`
+    case cnHn = "CN-HN"
+    
+    /// `CN-JL`
+    case cnJl = "CN-JL"
+    
+    /// `CN-JS`
+    case cnJs = "CN-JS"
+    
+    /// `CN-JX`
+    case cnJx = "CN-JX"
+    
+    /// `CN-LN`
+    case cnLn = "CN-LN"
+    
+    /// `CN-MO`
+    case cnMo = "CN-MO"
+    
+    /// `CN-NM`
+    case cnNm = "CN-NM"
+    
+    /// `CN-NX`
+    case cnNx = "CN-NX"
+    
+    /// `CN-QH`
+    case cnQh = "CN-QH"
+    
+    /// `CN-SC`
+    case cnSc = "CN-SC"
+    
+    /// `CN-SD`
+    case cnSd = "CN-SD"
+    
+    /// `CN-SH`
+    case cnSh = "CN-SH"
+    
+    /// `CN-SN`
+    case cnSn = "CN-SN"
+    
+    /// `CN-SX`
+    case cnSx = "CN-SX"
+    
+    /// `CN-TJ`
+    case cnTj = "CN-TJ"
+    
+    /// `CN-TW`
+    case cnTw = "CN-TW"
+    
+    /// `CN-XJ`
+    case cnXj = "CN-XJ"
+    
+    /// `CN-XZ`
+    case cnXz = "CN-XZ"
+    
+    /// `CN-YN`
+    case cnYn = "CN-YN"
+    
+    /// `CN-ZJ`
+    case cnZj = "CN-ZJ"
+    
+    /// `Andaman and Nicobar Islands`
+    case andamanAndNicobarIslands = "Andaman and Nicobar Islands"
+    
+    /// `Andhra Pradesh`
+    case andhraPradesh = "Andhra Pradesh"
+    
+    /// `APO`
+    case apo = "APO"
+    
+    /// `Arunachal Pradesh`
+    case arunachalPradesh = "Arunachal Pradesh"
+    
+    /// `Assam`
+    case assam = "Assam"
+    
+    /// `Bihar`
+    case bihar = "Bihar"
+    
+    /// `Chandigarh`
+    case chandigarh = "Chandigarh"
+    
+    /// `Chhattisgarh`
+    case chhattisgarh = "Chhattisgarh"
+    
+    /// `Dadra and Nagar Haveli`
+    case dadraAndNagarHaveli = "Dadra and Nagar Haveli"
+    
+    /// `Daman and Diu`
+    case damanAndDiu = "Daman and Diu"
+    
+    /// `Delhi (NCT)`
+    case delhiNCT = "Delhi (NCT)"
+    
+    /// `Goa`
+    case goa = "Goa"
+    
+    /// `Gujarat`
+    case gujarat = "Gujarat"
+    
+    /// `Haryana`
+    case haryana = "Haryana"
+    
+    /// `Himachal Pradesh`
+    case himachalPradesh = "Himachal Pradesh"
+    
+    /// `Jammu and Kashmir`
+    case jammuAndKashmir = "Jammu and Kashmir"
+    
+    /// `Jharkhand`
+    case jharkhand = "Jharkhand"
+    
+    /// `Karnataka`
+    case karnataka = "Karnataka"
+    
+    /// `Kerala`
+    case kerala = "Kerala"
+    
+    /// `Lakshadweep`
+    case lakshadweep = "Lakshadweep"
+    
+    /// `Madhya Pradesh`
+    case madhyaPradesh = "Madhya Pradesh"
+    
+    /// `Maharashtra`
+    case maharashtra = "Maharashtra"
+    
+    /// `Manipur`
+    case manipur = "Manipur"
+    
+    /// `Meghalaya`
+    case meghalaya = "Meghalaya"
+    
+    /// `Mizoram`
+    case mizoram = "Mizoram"
+    
+    /// `Nagaland`
+    case nagaland = "Nagaland"
+    
+    /// `Odisha`
+    case odisha = "Odisha"
+    
+    /// `Puducherry`
+    case puducherry = "Puducherry"
+    
+    /// `Punjab`
+    case punjab = "Punjab"
+    
+    /// `Rajasthan`
+    case rajasthan = "Rajasthan"
+    
+    /// `Sikkim`
+    case sikkim = "Sikkim"
+    
+    /// `Tamil Nadu`
+    case tamilNadu = "Tamil Nadu"
+    
+    /// `Telangana`
+    case telangana = "Telangana"
+    
+    /// `Tripura`
+    case tripura = "Tripura"
+    
+    /// `Uttar Pradesh`
+    case uttarPradesh = "Uttar Pradesh"
+    
+    /// `Uttarakhand`
+    case uttarakhand = "Uttarakhand"
+    
+    /// `West Bengal`
+    case westBengal = "West Bengal"
+    
+    /// `ID-BA`
+    case idBa = "ID-BA"
+    
+    /// `ID-BB`
+    case idBb = "ID-BB"
+    
+    /// `ID-BT`
+    case idBt = "ID-BT"
+    
+    /// `ID-BE`
+    case idBe = "ID-BE"
+    
+    /// `ID-YO`
+    case idYo = "ID-YO"
+    
+    /// `ID-JK`
+    case idJk = "ID-JK"
+    
+    /// `ID-GO`
+    case idGo = "ID-GO"
+    
+    /// `ID-JA`
+    case idJa = "ID-JA"
+    
+    /// `ID-JB`
+    case idJb = "ID-JB"
+    
+    /// `ID-JT`
+    case idJt = "ID-JT"
+    
+    /// `ID-JI`
+    case idJi = "ID-JI"
+    
+    /// `ID-KB`
+    case idKb = "ID-KB"
+    
+    /// `ID-KS`
+    case idKs = "ID-KS"
+    
+    /// `ID-KT`
+    case idKt = "ID-KT"
+    
+    /// `ID-KI`
+    case idKi = "ID-KI"
+    
+    /// `ID-KU`
+    case idKu = "ID-KU"
+    
+    /// `ID-KR`
+    case idKr = "ID-KR"
+    
+    /// `ID-LA`
+    case idLa = "ID-LA"
+    
+    /// `ID-MA`
+    case idMa = "ID-MA"
+    
+    /// `ID-MU`
+    case idMu = "ID-MU"
+    
+    /// `ID-AC`
+    case idAc = "ID-AC"
+    
+    /// `ID-NB`
+    case idNb = "ID-NB"
+    
+    /// `ID-NT`
+    case idNt = "ID-NT"
+    
+    /// `ID-PA`
+    case idPa = "ID-PA"
+    
+    /// `ID-PB`
+    case idPb = "ID-PB"
+    
+    /// `ID-RI`
+    case idRi = "ID-RI"
+    
+    /// `ID-SR`
+    case idSr = "ID-SR"
+    
+    /// `ID-SN`
+    case idSn = "ID-SN"
+    
+    /// `ID-ST`
+    case idSt = "ID-ST"
+    
+    /// `ID-SG`
+    case idSg = "ID-SG"
+    
+    /// `ID-SA`
+    case idSa = "ID-SA"
+    
+    /// `ID-SB`
+    case idSb = "ID-SB"
+    
+    /// `ID-SS`
+    case idSs = "ID-SS"
+    
+    /// `ID-SU`
+    case idSu = "ID-SU"
+    
+    /// `AG`
+    case ag = "AG"
+    
+    /// `AN`
+    case an = "AN"
+    
+    /// `AO`
+    case ao = "AO"
+    
+    /// `AR`
+    case ar = "AR"
+    
+    /// `AT`
+    case at = "AT"
+    
+    /// `AV`
+    case av = "AV"
+    
+    /// `BT`
+    case bt = "BT"
+    
+    /// `BL`
+    case bl = "BL"
+    
+    /// `BN`
+    case bn = "BN"
+    
+    /// `BG`
+    case bg = "BG"
+    
+    /// `BI`
+    case bi = "BI"
+    
+    /// `BO`
+    case bo = "BO"
+    
+    /// `BZ`
+    case bz = "BZ"
+    
+    /// `BS`
+    case bs = "BS"
+    
+    /// `BR`
+    case br = "BR"
+    
+    /// `CA`
+    case ca = "CA"
+    
+    /// `CL`
+    case cl = "CL"
+    
+    /// `CB`
+    case cb = "CB"
+    
+    /// `CI`
+    case ci = "CI"
+    
+    /// `CT`
+    case ct = "CT"
+    
+    /// `CZ`
+    case cz = "CZ"
+    
+    /// `CH`
+    case ch = "CH"
+    
+    /// `CO`
+    case co = "CO"
+    
+    /// `CS`
+    case cs = "CS"
+    
+    /// `CR`
+    case cr = "CR"
+    
+    /// `KR`
+    case kr = "KR"
+    
+    /// `EN`
+    case en = "EN"
+    
+    /// `FM`
+    case fm = "FM"
+    
+    /// `FE`
+    case fe = "FE"
+    
+    /// `FI`
+    case fi = "FI"
+    
+    /// `FG`
+    case fg = "FG"
+    
+    /// `FC`
+    case fc = "FC"
+    
+    /// `FR`
+    case fr = "FR"
+    
+    /// `GE`
+    case ge = "GE"
+    
+    /// `GR`
+    case gr = "GR"
+    
+    /// `IM`
+    case im = "IM"
+    
+    /// `IS`
+    case `is` = "IS"
+    
+    /// `AQ`
+    case aq = "AQ"
+    
+    /// `LT`
+    case lt = "LT"
+    
+    /// `LE`
+    case le = "LE"
+    
+    /// `LC`
+    case lc = "LC"
+    
+    /// `LI`
+    case li = "LI"
+    
+    /// `LO`
+    case lo = "LO"
+    
+    /// `LU`
+    case lu = "LU"
+    
+    /// `MC`
+    case mc = "MC"
+    
+    /// `MN`
+    case mn = "MN"
+    
+    /// `VS`
+    case vs = "VS"
+    
+    /// `ME`
+    case me = "ME"
+    
+    /// `MI`
+    case mi = "MI"
+    
+    /// `MO`
+    case mo = "MO"
+    
+    /// `NA`
+    case na = "NA"
+    
+    /// `NO`
+    case no = "NO"
+    
+    /// `OG`
+    case og = "OG"
+    
+    /// `OT`
+    case ot = "OT"
+    
+    /// `OR`
+    case or = "OR"
+    
+    /// `PD`
+    case pd = "PD"
+    
+    /// `PV`
+    case pv = "PV"
+    
+    /// `PG`
+    case pg = "PG"
+    
+    /// `PU`
+    case pu = "PU"
+    
+    /// `PC`
+    case pc = "PC"
+    
+    /// `PT`
+    case pt = "PT"
+    
+    /// `PN`
+    case pn = "PN"
+    
+    /// `PZ`
+    case pz = "PZ"
+    
+    /// `PO`
+    case po = "PO"
+    
+    /// `RG`
+    case rg = "RG"
+    
+    /// `RA`
+    case ra = "RA"
+    
+    /// `RC`
+    case rc = "RC"
+    
+    /// `RE`
+    case re = "RE"
+    
+    /// `RI`
+    case ri = "RI"
+    
+    /// `RM`
+    case rm = "RM"
+    
+    /// `SA`
+    case sa = "SA"
+    
+    /// `SS`
+    case ss = "SS"
+    
+    /// `SV`
+    case sv = "SV"
+    
+    /// `SI`
+    case si = "SI"
+    
+    /// `SR`
+    case sr = "SR"
+    
+    /// `SO`
+    case so = "SO"
+    
+    /// `TA`
+    case ta = "TA"
+    
+    /// `TE`
+    case te = "TE"
+    
+    /// `TR`
+    case tr = "TR"
+    
+    /// `TP`
+    case tp = "TP"
+    
+    /// `TN`
+    case tn = "TN"
+    
+    /// `TV`
+    case tv = "TV"
+    
+    /// `TS`
+    case ts = "TS"
+    
+    /// `UD`
+    case ud = "UD"
+    
+    /// `VA`
+    case va = "VA"
+    
+    /// `VE`
+    case ve = "VE"
+    
+    /// `VB`
+    case vb = "VB"
+    
+    /// `VC`
+    case vc = "VC"
+    
+    /// `VR`
+    case vr = "VR"
+    
+    /// `VV`
+    case vv = "VV"
+    
+    /// `VI`
+    case vi = "VI"
+    
+    /// `VT`
+    case vt = "VT"
+    
+    /// `AICHI-KEN`
+    case aichiKen = "AICHI-KEN"
+    
+    /// `AKITA-KEN`
+    case akitaKen = "AKITA-KEN"
+    
+    /// `AOMORI-KEN`
+    case aomoriKen = "AOMORI-KEN"
+    
+    /// `CHIBA-KEN`
+    case chibaKen = "CHIBA-KEN"
+    
+    /// `EHIME-KEN`
+    case ehimeKen = "EHIME-KEN"
+    
+    /// `FUKUI-KEN`
+    case fukuiKen = "FUKUI-KEN"
+    
+    /// `FUKUOKA-KEN`
+    case fukuokaKen = "FUKUOKA-KEN"
+    
+    /// `FUKUSHIMA-KEN`
+    case fukushimaKen = "FUKUSHIMA-KEN"
+    
+    /// `GIFU-KEN`
+    case gifuKen = "GIFU-KEN"
+    
+    /// `GUNMA-KEN`
+    case gunmaKen = "GUNMA-KEN"
+    
+    /// `HIROSHIMA-KEN`
+    case hiroshimaKen = "HIROSHIMA-KEN"
+    
+    /// `HOKKAIDO`
+    case hokkaido = "HOKKAIDO"
+    
+    /// `HYOGO-KEN`
+    case hyogoKen = "HYOGO-KEN"
+    
+    /// `IBARAKI-KEN`
+    case ibarakiKen = "IBARAKI-KEN"
+    
+    /// `ISHIKAWA-KEN`
+    case ishikawaKen = "ISHIKAWA-KEN"
+    
+    /// `IWATE-KEN`
+    case iwateKen = "IWATE-KEN"
+    
+    /// `KAGAWA-KEN`
+    case kagawaKen = "KAGAWA-KEN"
+    
+    /// `KAGOSHIMA-KEN`
+    case kagoshimaKen = "KAGOSHIMA-KEN"
+    
+    /// `KANAGAWA-KEN`
+    case kanagawaKen = "KANAGAWA-KEN"
+    
+    /// `KOCHI-KEN`
+    case kochiKen = "KOCHI-KEN"
+    
+    /// `KUMAMOTO-KEN`
+    case kumamotoKen = "KUMAMOTO-KEN"
+    
+    /// `KYOTO-FU`
+    case kyotoFu = "KYOTO-FU"
+    
+    /// `MIE-KEN`
+    case mieKen = "MIE-KEN"
+    
+    /// `MIYAGI-KEN`
+    case miyagiKen = "MIYAGI-KEN"
+    
+    /// `MIYAZAKI-KEN`
+    case miyazakiKen = "MIYAZAKI-KEN"
+    
+    /// `NAGANO-KEN`
+    case naganoKen = "NAGANO-KEN"
+    
+    /// `NAGASAKI-KEN`
+    case nagasakiKen = "NAGASAKI-KEN"
+    
+    /// `NARA-KEN`
+    case naraKen = "NARA-KEN"
+    
+    /// `NIIGATA-KEN`
+    case niigataKen = "NIIGATA-KEN"
+    
+    /// `OITA-KEN`
+    case oitaKen = "OITA-KEN"
+    
+    /// `OKAYAMA-KEN`
+    case okayamaKen = "OKAYAMA-KEN"
+    
+    /// `OKINAWA-KEN`
+    case okinawaKen = "OKINAWA-KEN"
+    
+    /// `OSAKA-FU`
+    case osakaFu = "OSAKA-FU"
+    
+    /// `SAGA-KEN`
+    case sagaKen = "SAGA-KEN"
+    
+    /// `SAITAMA-KEN`
+    case saitamaKen = "SAITAMA-KEN"
+    
+    /// `SHIGA-KEN`
+    case shigaKen = "SHIGA-KEN"
+    
+    /// `SHIMANE-KEN`
+    case shimaneKen = "SHIMANE-KEN"
+    
+    /// `SHIZUOKA-KEN`
+    case shizuokaKen = "SHIZUOKA-KEN"
+    
+    /// `TOCHIGI-KEN`
+    case tochigiKen = "TOCHIGI-KEN"
+    
+    /// `TOKUSHIMA-KEN`
+    case tokushimaKen = "TOKUSHIMA-KEN"
+    
+    /// `TOKYO-TO`
+    case tokyoTo = "TOKYO-TO"
+    
+    /// `TOTTORI-KEN`
+    case tottoriKen = "TOTTORI-KEN"
+    
+    /// `TOYAMA-KEN`
+    case toyamaKen = "TOYAMA-KEN"
+    
+    /// `WAKAYAMA-KEN`
+    case wakayamaKen = "WAKAYAMA-KEN"
+    
+    /// `YAMAGATA-KEN`
+    case yamagataKen = "YAMAGATA-KEN"
+    
+    /// `YAMAGUCHI-KEN`
+    case yamaguchiKen = "YAMAGUCHI-KEN"
+    
+    /// `YAMANASHI-KEN`
+    case yamanashiKen = "YAMANASHI-KEN"
+    
+    /// `AGS`
+    case ags = "AGS"
+    
+    /// `BCS`
+    case bcs = "BCS"
+    
+    /// `CAMP`
+    case camp = "CAMP"
+    
+    /// `CHIS`
+    case chis = "CHIS"
+    
+    /// `CHIH`
+    case chih = "CHIH"
+    
+    /// `CDMX`
+    case cdmx = "CDMX"
+    
+    /// `COAH`
+    case coah = "COAH"
+    
+    /// `COL`
+    case col = "COL"
+    
+    /// `DGO`
+    case dgo = "DGO"
+    
+    /// `MEX`
+    case mex = "MEX"
+    
+    /// `GTO`
+    case gto = "GTO"
+    
+    /// `GRO`
+    case gro = "GRO"
+    
+    /// `HGO`
+    case hgo = "HGO"
+    
+    /// `JAL`
+    case jal = "JAL"
+    
+    /// `MICH`
+    case mich = "MICH"
+    
+    /// `MOR`
+    case mor = "MOR"
+    
+    /// `NAY`
+    case nay = "NAY"
+    
+    /// `OAX`
+    case oax = "OAX"
+    
+    /// `PUE`
+    case pue = "PUE"
+    
+    /// `QRO`
+    case qro = "QRO"
+    
+    /// `Q ROO`
+    case qROO = "Q ROO"
+    
+    /// `SLP`
+    case slp = "SLP"
+    
+    /// `SIN`
+    case sin = "SIN"
+    
+    /// `SON`
+    case son = "SON"
+    
+    /// `TAB`
+    case tab = "TAB"
+    
+    /// `TAMPS`
+    case tamps = "TAMPS"
+    
+    /// `TLAX`
+    case tlax = "TLAX"
+    
+    /// `VER`
+    case ver = "VER"
+    
+    /// `YUC`
+    case yuc = "YUC"
+    
+    /// `ZAC`
+    case zac = "ZAC"
+    
+    /// `Amnat Charoen`
+    case amnatCharoen = "Amnat Charoen"
+    
+    /// `Ang Thong`
+    case angThong = "Ang Thong"
+    
+    /// `Bangkok`
+    case bangkok = "Bangkok"
+    
+    /// `Bueng Kan`
+    case buengKan = "Bueng Kan"
+    
+    /// `Buri Ram`
+    case buriRam = "Buri Ram"
+    
+    /// `Chachoengsao`
+    case chachoengsao = "Chachoengsao"
+    
+    /// `Chai Nat`
+    case chaiNat = "Chai Nat"
+    
+    /// `Chaiyaphum`
+    case chaiyaphum = "Chaiyaphum"
+    
+    /// `Chanthaburi`
+    case chanthaburi = "Chanthaburi"
+    
+    /// `Chiang Mai`
+    case chiangMai = "Chiang Mai"
+    
+    /// `Chiang Rai`
+    case chiangRai = "Chiang Rai"
+    
+    /// `Chon Buri`
+    case chonBuri = "Chon Buri"
+    
+    /// `Chumphon`
+    case chumphon = "Chumphon"
+    
+    /// `Kalasin`
+    case kalasin = "Kalasin"
+    
+    /// `Kamphaeng Phet`
+    case kamphaengPhet = "Kamphaeng Phet"
+    
+    /// `Kanchanaburi`
+    case kanchanaburi = "Kanchanaburi"
+    
+    /// `Khon Kaen`
+    case khonKaen = "Khon Kaen"
+    
+    /// `Krabi`
+    case krabi = "Krabi"
+    
+    /// `Lampang`
+    case lampang = "Lampang"
+    
+    /// `Lamphun`
+    case lamphun = "Lamphun"
+    
+    /// `Loei`
+    case loei = "Loei"
+    
+    /// `Lop Buri`
+    case lopBuri = "Lop Buri"
+    
+    /// `Mae Hong Son`
+    case maeHongSon = "Mae Hong Son"
+    
+    /// `Maha Sarakham`
+    case mahaSarakham = "Maha Sarakham"
+    
+    /// `Mukdahan`
+    case mukdahan = "Mukdahan"
+    
+    /// `Nakhon Nayok`
+    case nakhonNayok = "Nakhon Nayok"
+    
+    /// `Nakhon Pathom`
+    case nakhonPathom = "Nakhon Pathom"
+    
+    /// `Nakhon Phanom`
+    case nakhonPhanom = "Nakhon Phanom"
+    
+    /// `Nakhon Ratchasima`
+    case nakhonRatchasima = "Nakhon Ratchasima"
+    
+    /// `Nakhon Sawan`
+    case nakhonSawan = "Nakhon Sawan"
+    
+    /// `Nakhon Si Thammarat`
+    case nakhonSiThammarat = "Nakhon Si Thammarat"
+    
+    /// `Nan`
+    case nan = "Nan"
+    
+    /// `Narathiwat`
+    case narathiwat = "Narathiwat"
+    
+    /// `Nong Bua Lamphu`
+    case nongBuaLamphu = "Nong Bua Lamphu"
+    
+    /// `Nong Khai`
+    case nongKhai = "Nong Khai"
+    
+    /// `Nonthaburi`
+    case nonthaburi = "Nonthaburi"
+    
+    /// `Pathum Thani`
+    case pathumThani = "Pathum Thani"
+    
+    /// `Pattani`
+    case pattani = "Pattani"
+    
+    /// `Phang Nga`
+    case phangNga = "Phang Nga"
+    
+    /// `Phatthalung`
+    case phatthalung = "Phatthalung"
+    
+    /// `Phatthaya`
+    case phatthaya = "Phatthaya"
+    
+    /// `Phayao`
+    case phayao = "Phayao"
+    
+    /// `Phetchabun`
+    case phetchabun = "Phetchabun"
+    
+    /// `Phetchaburi`
+    case phetchaburi = "Phetchaburi"
+    
+    /// `Phichit`
+    case phichit = "Phichit"
+    
+    /// `Phitsanulok`
+    case phitsanulok = "Phitsanulok"
+    
+    /// `Phra Nakhon Si Ayutthaya`
+    case phraNakhonSiAyutthaya = "Phra Nakhon Si Ayutthaya"
+    
+    /// `Phrae`
+    case phrae = "Phrae"
+    
+    /// `Phuket`
+    case phuket = "Phuket"
+    
+    /// `Prachin Buri`
+    case prachinBuri = "Prachin Buri"
+    
+    /// `Prachuap Khiri Khan`
+    case prachuapKhiriKhan = "Prachuap Khiri Khan"
+    
+    /// `Ranong`
+    case ranong = "Ranong"
+    
+    /// `Ratchaburi`
+    case ratchaburi = "Ratchaburi"
+    
+    /// `Rayong`
+    case rayong = "Rayong"
+    
+    /// `Roi Et`
+    case roiEt = "Roi Et"
+    
+    /// `Sa Kaeo`
+    case saKaeo = "Sa Kaeo"
+    
+    /// `Sakon Nakhon`
+    case sakonNakhon = "Sakon Nakhon"
+    
+    /// `Samut Prakan`
+    case samutPrakan = "Samut Prakan"
+    
+    /// `Samut Sakhon`
+    case samutSakhon = "Samut Sakhon"
+    
+    /// `Samut Songkhram`
+    case samutSongkhram = "Samut Songkhram"
+    
+    /// `Saraburi`
+    case saraburi = "Saraburi"
+    
+    /// `Satun`
+    case satun = "Satun"
+    
+    /// `Si Sa Ket`
+    case siSaKet = "Si Sa Ket"
+    
+    /// `Sing Buri`
+    case singBuri = "Sing Buri"
+    
+    /// `Songkhla`
+    case songkhla = "Songkhla"
+    
+    /// `Sukhothai`
+    case sukhothai = "Sukhothai"
+    
+    /// `Suphan Buri`
+    case suphanBuri = "Suphan Buri"
+    
+    /// `Surat Thani`
+    case suratThani = "Surat Thani"
+    
+    /// `Surin`
+    case surin = "Surin"
+    
+    /// `Tak`
+    case tak = "Tak"
+    
+    /// `Trang`
+    case trang = "Trang"
+    
+    /// `Trat`
+    case trat = "Trat"
+    
+    /// `Ubon Ratchathani`
+    case ubonRatchathani = "Ubon Ratchathani"
+    
+    /// `Udon Thani`
+    case udonThani = "Udon Thani"
+    
+    /// `Uthai Thani`
+    case uthaiThani = "Uthai Thani"
+    
+    /// `Uttaradit`
+    case uttaradit = "Uttaradit"
+    
+    /// `Yala`
+    case yala = "Yala"
+    
+    /// `Yasothon`
+    case yasothon = "Yasothon"
+    
+    /// `AK`
+    case ak = "AK"
+    
+    /// `AZ`
+    case az = "AZ"
+    
+    /// `DE`
+    case de = "DE"
+    
+    /// `DC`
+    case dc = "DC"
+    
+    /// `FL`
+    case fl = "FL"
+    
+    /// `GA`
+    case ga = "GA"
+    
+    /// `HI`
+    case hi = "HI"
+    
+    /// `IL`
+    case il = "IL"
+    
+    /// `IN`
+    case `in` = "IN"
+    
+    /// `IA`
+    case ia = "IA"
+    
+    /// `KS`
+    case ks = "KS"
+    
+    /// `KY`
+    case ky = "KY"
+    
+    /// `LA`
+    case la = "LA"
+    
+    /// `MD`
+    case md = "MD"
+    
+    /// `NE`
+    case ne = "NE"
+    
+    /// `NV`
+    case nv = "NV"
+    
+    /// `NH`
+    case nh = "NH"
+    
+    /// `NJ`
+    case nj = "NJ"
+    
+    /// `NM`
+    case nm = "NM"
+    
+    /// `NY`
+    case ny = "NY"
+    
+    /// `NC`
+    case nc = "NC"
+    
+    /// `ND`
+    case nd = "ND"
+    
+    /// `OH`
+    case oh = "OH"
+    
+    /// `OK`
+    case ok = "OK"
+    
+    /// `SD`
+    case sd = "SD"
+    
+    /// `TX`
+    case tx = "TX"
+    
+    /// `UT`
+    case ut = "UT"
+    
+    /// `WA`
+    case wa = "WA"
+    
+    /// `WV`
+    case wv = "WV"
+    
+    /// `WI`
+    case wi = "WI"
+    
+    /// `WY`
+    case wy = "WY"
+    
+    /// `AA`
+    case aa = "AA"
+    
+    /// `AE`
+    case ae = "AE"
+    
+    /// `AS`
+    case `as` = "AS"
+    
+    /// `GU`
+    case gu = "GU"
+    
+    /// `MH`
+    case mh = "MH"
+    
+    /// `MP`
+    case mp = "MP"
+    
+    /// `PW`
+    case pw = "PW"
+}
diff --git a/Sources/PayPal/Models/ShippingCosts.swift b/Sources/PayPal/Models/ShippingCosts.swift
index 1d65c40e..d7d9520a 100644
--- a/Sources/PayPal/Models/ShippingCosts.swift
+++ b/Sources/PayPal/Models/ShippingCosts.swift
@@ -4,7 +4,7 @@ import Vapor
 public struct ShippingCosts: Content, Equatable {
     
     /// The currency and amount of the shipping charge. Value is from `0` to `1,000,000`. Supports up to two decimal places.
-    public var amount: Amount?
+    public var amount: CurrencyAmount?
     
     /// The tax percentage on the shipping amount.
     public var tax: Tax?
@@ -12,7 +12,7 @@ public struct ShippingCosts: Content, Equatable {
     /// Creates a new `ShippingCosts` instance.
     ///
     ///     ShippingCosts(amount: Amount(currency: .usd, value: "2.50"), tax: Tax(name: "Shipping", percent: 7.5, amount: Amount(currency: .usd, value: "0.18")))
-    public init(amount: Amount?, tax: Tax?) {
+    public init(amount: CurrencyAmount?, tax: Tax?) {
         self.amount = amount
         self.tax = tax
     }
diff --git a/Sources/PayPal/Models/Tax.swift b/Sources/PayPal/Models/Tax.swift
index 9680079d..5fa4b7a2 100644
--- a/Sources/PayPal/Models/Tax.swift
+++ b/Sources/PayPal/Models/Tax.swift
@@ -20,13 +20,13 @@ public struct Tax: Content, ValidationSetable, Equatable {
     public private(set) var percent: Decimal
     
     /// The currency and amount of the calculated tax.
-    public let amount: Amount?
+    public let amount: CurrencyAmount?
     
     
     /// Creates a new `Tax` instance.
     ///
     ///     Tax(name: "Sales", percent: 10, amount: Amount(currency: .usd, value: "0.59"))
-    public init(name: String, percent: Decimal, amount: Amount?)throws {
+    public init(name: String, percent: Decimal, amount: CurrencyAmount?)throws {
         self.name = name
         self.percent = percent
         self.amount = amount
@@ -43,7 +43,7 @@ public struct Tax: Content, ValidationSetable, Equatable {
         
         self.name = name
         self.percent = percent
-        self.amount = try container.decodeIfPresent(Amount.self, forKey: .amount)
+        self.amount = try container.decodeIfPresent(CurrencyAmount.self, forKey: .amount)
         
         try self.set(\.name <~ name)
         try self.set(\.percent <~ percent)
diff --git a/Sources/PayPal/Models/Template/TemplateData.swift b/Sources/PayPal/Models/Template/TemplateData.swift
index c0b92ab2..6b7426af 100644
--- a/Sources/PayPal/Models/Template/TemplateData.swift
+++ b/Sources/PayPal/Models/Template/TemplateData.swift
@@ -6,7 +6,7 @@ extension Template {
     public struct Data: Content, ValidationSetable, Equatable {
         
         /// The currency and amount of the invoice total.
-        public let total: Amount?
+        public let total: CurrencyAmount?
         
         
         /// The merchant business information that appears on the invoice.
@@ -38,13 +38,13 @@ extension Template {
         public private(set) var reference: String?
         
         /// The invoice level discount, as a percent or an amount value.
-        public var discount: Discount<Amount>?
+        public var discount: Discount<CurrencyAmount>?
         
         /// The shipping cost, as a percent or an amount value.
         public var shippingCost: ShippingCosts?
         
         /// The custom amount to apply to an invoice. If you include a label, you must include a custom amount.
-        public var custom: CustomAmount<Amount>?
+        public var custom: CustomAmount<CurrencyAmount>?
         
         /// Indicates whether the invoice allows a partial payment. If `false`, the invoice must be paid in full. If `true`, the invoice allows partial payments.
         ///
@@ -52,7 +52,7 @@ extension Template {
         public var allowPartialPayment: Bool?
         
         /// The currency and amount of the minimum allowed for a partial payment. Valid only when `allow_partial_payment` is `true`.
-        public var minimumDue: Amount?
+        public var minimumDue: CurrencyAmount?
         
         /// Indicates whether the tax is calculated before or after a discount. If `false`, the tax is calculated before a discount.
         /// If `true`, the tax is calculated after a discount.
@@ -139,11 +139,11 @@ extension Template {
             items: [Invoice.Item]? = nil,
             payment: PaymentTerm? = nil,
             reference: String? = nil,
-            discount: Discount<Amount>? = nil,
+            discount: Discount<CurrencyAmount>? = nil,
             shippingCost: ShippingCosts? = nil,
-            custom: CustomAmount<Amount>? = nil,
+            custom: CustomAmount<CurrencyAmount>? = nil,
             allowPartialPayment: Bool? = nil,
-            minimumDue: Amount? = nil,
+            minimumDue: CurrencyAmount? = nil,
             taxCalculatedAfterDiscount: Bool? = nil,
             taxInclusive: Bool? = nil,
             terms: String? = nil,
@@ -196,7 +196,7 @@ extension Template {
             self.memo = memo
             self.logo = logo
             
-            self.total = try container.decodeIfPresent(Amount.self, forKey: .total)
+            self.total = try container.decodeIfPresent(CurrencyAmount.self, forKey: .total)
             self.attachments = try container.decodeIfPresent([FileAttachment].self, forKey: .attachments)
             
             self.merchant = try container.decode(MerchantInfo.self, forKey: .merchant)
@@ -205,11 +205,11 @@ extension Template {
             self.cc = try container.decodeIfPresent([Email].self, forKey: .cc)
             self.items = try container.decodeIfPresent([Invoice.Item].self, forKey: .items)
             self.payment = try container.decodeIfPresent(PaymentTerm.self, forKey: .payment)
-            self.discount = try container.decodeIfPresent(Discount<Amount>.self, forKey: .discount)
+            self.discount = try container.decodeIfPresent(Discount<CurrencyAmount>.self, forKey: .discount)
             self.shippingCost = try container.decodeIfPresent(ShippingCosts.self, forKey: .shippingCost)
-            self.custom = try container.decodeIfPresent(CustomAmount<Amount>.self, forKey: .custom)
+            self.custom = try container.decodeIfPresent(CustomAmount<CurrencyAmount>.self, forKey: .custom)
             self.allowPartialPayment = try container.decodeIfPresent(Bool.self, forKey: .allowPartialPayment)
-            self.minimumDue = try container.decodeIfPresent(Amount.self, forKey: .minimumDue)
+            self.minimumDue = try container.decodeIfPresent(CurrencyAmount.self, forKey: .minimumDue)
             self.taxCalculatedAfterDiscount = try container.decodeIfPresent(Bool.self, forKey: .taxCalculatedAfterDiscount)
             self.taxInclusive = try container.decodeIfPresent(Bool.self, forKey: .taxInclusive)
             
diff --git a/Sources/PayPal/Models/Template/TemplateList.swift b/Sources/PayPal/Models/Template/TemplateList.swift
index f5b72660..be20e2c4 100644
--- a/Sources/PayPal/Models/Template/TemplateList.swift
+++ b/Sources/PayPal/Models/Template/TemplateList.swift
@@ -1,34 +1,37 @@
 import Vapor
 
-/// The list of templates returned from the `GET /v1/invoicing/templates` PayPal endpoint.
-public struct TemplateList: Content, Equatable {
-    
-    /// An array of request-related [HATEOAS links](https://developer.paypal.com/docs/api/overview/#hateoas-links).
-    public let links: [LinkDescription]?
-    
-    
-    /// An array of postal addresses in the user's PayPal profile.
-    public var addresses: [Address]?
-    
-    /// An array of email addresses in the user's PayPal profile.
-    public var emails: [Email]?
-    
-    /// An array of phone numbers in the user's PayPal profile.
-    public var phones: [PhoneNumber]?
-    
-    /// The details for each template. If `fields` is `none`, returns only the template name, ID, and default status.
-    public var templates: [Template]?
-    
-    
-    /// Creates a new `TemplateList` instance.
-    ///
-    /// Instead of creating a `TemplateList` with this initializer, you will most likely want to create it
-    /// be decoding it from a JSON response from the PayPal API.
-    public init(addresses: [Address]?, emails: [Email]?, phones: [PhoneNumber]?, templates: [Template]?) {
-        self.links = nil
-        self.addresses = addresses
-        self.emails = emails
-        self.phones = phones
-        self.templates = templates
+extension Template {
+    
+    /// The list of templates returned from the `GET /v1/invoicing/templates` PayPal endpoint.
+    public struct List: Content, Equatable {
+        
+        /// An array of request-related [HATEOAS links](https://developer.paypal.com/docs/api/overview/#hateoas-links).
+        public let links: [LinkDescription]?
+        
+        
+        /// An array of postal addresses in the user's PayPal profile.
+        public var addresses: [Address]?
+        
+        /// An array of email addresses in the user's PayPal profile.
+        public var emails: [Email]?
+        
+        /// An array of phone numbers in the user's PayPal profile.
+        public var phones: [PhoneNumber]?
+        
+        /// The details for each template. If `fields` is `none`, returns only the template name, ID, and default status.
+        public var templates: [Template]?
+        
+        
+        /// Creates a new `TemplateList` instance.
+        ///
+        /// Instead of creating a `TemplateList` with this initializer, you will most likely want to create it
+        /// be decoding it from a JSON response from the PayPal API.
+        public init(addresses: [Address]?, emails: [Email]?, phones: [PhoneNumber]?, templates: [Template]?) {
+            self.links = nil
+            self.addresses = addresses
+            self.emails = emails
+            self.phones = phones
+            self.templates = templates
+        }
     }
 }
diff --git a/Sources/PayPal/Models/TimelessDate.swift b/Sources/PayPal/Models/TimelessDate.swift
index 415e247c..3b51054e 100644
--- a/Sources/PayPal/Models/TimelessDate.swift
+++ b/Sources/PayPal/Models/TimelessDate.swift
@@ -1,51 +1,68 @@
 import Vapor
 
-/// Date information without a timestamp.
-public struct TimelessDate: Content, ValidationSetable, Equatable {
+/// The stand-alone date, in [Internet date and time format](https://tools.ietf.org/html/rfc3339#section-5.6). To represent special legal values,
+/// such as a date of birth, you should use dates with no associated time or time-zone data. Whenever possible, use the standard `date_time` type.
+public struct TimelessDate: Content, Equatable, ExpressibleByFloatLiteral {
+    internal static let formatter: DateFormatter = {
+        let formatter = DateFormatter()
+        formatter.calendar = Calendar(identifier: .iso8601)
+        formatter.locale = Locale(identifier: "en_US_POSIX")
+        formatter.timeZone = TimeZone(secondsFromGMT: 0)
+        formatter.dateFormat = "yyyy-MM-dd"
+        return formatter
+    }()
     
-    /// The stand-alone date, in [Internet date and time format](https://tools.ietf.org/html/rfc3339#section-5.6). To represent special legal values,
-    /// such as a date of birth, you should use dates with no associated time or time-zone data. Whenever possible, use the standard `date_time` type.
-    /// This regular expression does not validate all dates. For example, February 31 is valid and nothing is known about leap years.
+    /// The UNIX timestamp for the date being represented.
     ///
-    /// This property can be set using the `TimelessDate.set(_:)` method, This method
-    /// validates the new value before assigning it to the property.
+    /// This timestamp is converted to a date and then formated for encoding and decoding.
+    public var timestamp: TimeInterval?
+    
+    /// Creates a new `TimelessDate` instance from a `Date`.
     ///
-    /// Length: 10. Pattern: `^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$`.
-    public private(set) var date: String?
+    /// - Parameter date: The `Date` instance to get the timestamp from.
+    public init(_ date: Date?) {
+        self.timestamp = date?.timeIntervalSince1970
+    }
     
+    /// Creates a new `TimelessDate` instance from a `String`.
+    ///
+    /// - Parameter date: The date representation, formatted as `yyyy-mm-dd`.
+    public init?(date: String?) {
+        guard let string = date, let date = TimelessDate.formatter.date(from: string) else { return nil }
+        self.timestamp = date.timeIntervalSince1970
+    }
     
-    /// Creates a new `TimelessDate` instance.
+    /// Creates a new `TimelessDate` instance from a `TimeInterval` (`Double`) instance.
     ///
-    ///     TimelessDate(date: "1517-10-31")
-    public init(date: String?)throws {
-        self.date = date
-        
-        try self.set(\.date <~ date)
+    /// Do not use the initializer directly. Instead, assign a `TimeInterval` litteral to a
+    /// variable of type `TimelessDate`:
+    ///
+    ///     let date: TimelessDate = 981_244_800_000
+    ///
+    /// - Parameter floatLiteral: The timestamp to use for the date.
+    public init(floatLiteral value: TimeInterval) {
+        self.timestamp = value
     }
     
     /// See [`Decodable.init(from:)`](https://developer.apple.com/documentation/swift/decodable/2894081-init).
     public init(from decoder: Decoder)throws {
-        let container = try decoder.container(keyedBy: CodingKeys.self)
-        let date = try container.decodeIfPresent(String.self, forKey: .date)
-        
-        self.date = date
-        
-        try self.set(\.date <~ date)
+        let raw = try decoder.container(keyedBy: CodingKeys.self).decode(String.self, forKey: .date)
+        guard let date = TimelessDate.formatter.date(from: raw) else {
+            throw PayPalError(status: .badRequest, identifier: "dateFormat", reason: "Expected date to be formatted as `yyyy-mm-dd`")
+        }
+        self.timestamp = date.timeIntervalSince1970
     }
     
-    /// See `ValidationSetable.setterValidations()`
-    public func setterValidations() -> SetterValidations<TimelessDate> {
-        var validations = SetterValidations(TimelessDate.self)
-        
-        validations.set(\.date) { date in
-            guard let date = date else { return }
-            let pattern = "^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$"
-            guard date.range(of: pattern, options: .regularExpression) != nil else {
-                throw PayPalError(status: .badRequest, identifier: "malformedString", reason: "`date` value must match RegEx pattern `\(pattern)`")
-            }
+    /// See [`Encodable.encode(to:)`](https://developer.apple.com/documentation/swift/encodable/2893603-encode).
+    public func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: CodingKeys.self)
+        if let timestamp = self.timestamp {
+            let date = Date(timeIntervalSince1970: timestamp)
+            let raw = TimelessDate.formatter.string(from: date)
+            try container.encode(raw, forKey: .date)
+        } else {
+            try container.encodeNil(forKey: .date)
         }
-        
-        return validations
     }
     
     enum CodingKeys: String, CodingKey {
diff --git a/Sources/PayPal/Models/User/UserAddress.swift b/Sources/PayPal/Models/User/UserAddress.swift
index f73de27b..49f054e5 100644
--- a/Sources/PayPal/Models/User/UserAddress.swift
+++ b/Sources/PayPal/Models/User/UserAddress.swift
@@ -17,8 +17,8 @@ extension UserInfo {
         /// The zip code or postal code.
         public let zip: String?
         
-        /// The country.s
-        public let country: String?
+        /// The country.
+        public let country: Country?
         
         enum CodingKeys: String, CodingKey {
             case locality, region, country
diff --git a/Sources/PayPal/Utilities/HTTPHeaders.swift b/Sources/PayPal/Utilities/HTTPHeaders.swift
new file mode 100644
index 00000000..447b0b98
--- /dev/null
+++ b/Sources/PayPal/Utilities/HTTPHeaders.swift
@@ -0,0 +1,61 @@
+import HTTP
+
+extension HTTPHeaderName {
+    
+    /// `PayPal-Auth-Assertion`
+    ///
+    /// Specifies an API client-provided [JSON Web Token (JWT)](https://tools.ietf.org/html/rfc7519) assertion that identifies the merchant.
+    ///
+    /// When an API client acts on behalf of multiple merchants at the same time, it becomes difficult and expensive to generate and manage
+    /// multiple access tokens. Instead, API clients can use this header to provide a JWT assertion that identifies the merchant when the
+    /// API is called.
+    ///
+    /// - Note: To use this header, you must get consent to act on behalf of a merchant.
+    ///
+    /// In the header, specify one of these JSON Web Token sub-forms:
+    /// - [JSON Web Encryption (JWE)](https://tools.ietf.org/html/rfc7516), in
+    ///   [JWS Compact Serialization](https://tools.ietf.org/html/rfc7515#section-3.1) format.
+    /// - [JSON Web Signature (JWS)](https://tools.ietf.org/html/rfc7515), in
+    ///   [JWE Compact Serialization](https://tools.ietf.org/html/rfc7516#section-3.1) format. Supports both secure and unsecured JWT.
+    ///   An unsecured JWT specifies an `alg` of `none` in the `JOSE` header and an empty string for the signature.
+    ///
+    /// Unsecured JWT example:
+    /// - JOSE header:
+    ///   ```
+    ///   {"alg": "none"}
+    ///   ```
+    /// - Payload can contain `email`, `client_id`, and `payer_id`. Example payload:
+    ///   ```
+    ///   {"iss": "client_id","email":"my-email@example.com"}
+    ///   ```
+    /// - Signature. Use `""` for the unsigned case.
+    /// - Resulting unsecured JWT after Base64 and simple concatenation:
+    ///   ```
+    ///   eyJhbGciOiJub25lIn0.eyJlbWFpbCI6Im15QGVtYWlsLmNvbSJ9
+    ///   ```
+    ///
+    /// All API endpoints support this header.
+    public static let paypalAuth = HTTPHeaderName("PayPal-Auth-Assertion")
+    
+    /// `PayPal-Client-Metadata-Id`
+    ///
+    /// Verifies that the payment originates from a valid, user-consented device and application. Reduces fraud and decreases declines.
+    /// Transactions that do not include a client metadata ID are not eligible for PayPal Seller Protection.
+    public static let paypalMetadata = HTTPHeaderName("PayPal-Client-Metadata-Id")
+    
+    /// `PayPal-Partner-Attribution-Id`
+    ///
+    /// Indicates that you are a PayPal partner. To receive revenue attribution, specify a unique build notation (BN) code.
+    /// BN codes provide tracking on all transactions that originate or are associated with a particular partner. To learn more or
+    /// to request a BN code, contact your partner manager or visit the [PayPal Partner Portal](https://www.paypal.com/partnerprogram/).
+    public static let paypalAttribution = HTTPHeaderName("PayPal-Partner-Attribution-Id")
+    
+    /// `PayPal-Request-Id`
+    ///
+    /// Contains a unique user-generated ID that you can use to enforce idempotency.
+    ///
+    /// - Note:
+    ///   - If you omit this header, the risk of duplicate transactions increases.
+    ///   - Not all APIs support this header. To determine whether your API supports it, see the API reference for your API.
+    public static let paypalRequest = HTTPHeaderName("PayPal-Request-Id")
+}
diff --git a/Sources/PayPal/Utilities/ISO8601.swift b/Sources/PayPal/Utilities/ISO8601.swift
index 6cce98f2..1ce6dc3b 100644
--- a/Sources/PayPal/Utilities/ISO8601.swift
+++ b/Sources/PayPal/Utilities/ISO8601.swift
@@ -23,16 +23,13 @@ extension Date {
     }
     
     public init?(iso8601: String) {
+        let converter: ((String) -> Date?)?
         if #available(OSX 10.12, *) {
-            if let formatter = DateFormatter.iso8601 as? ISO8601DateFormatter, let date = formatter.date(from: iso8601) {
-                self = date
-                return
-            }
-        }
-        if let formatter = DateFormatter.iso8601 as? DateFormatter, let date = formatter.date(from: iso8601) {
-            self = date
+            converter = (DateFormatter.iso8601 as? ISO8601DateFormatter)?.date
         } else {
-            return nil
+            converter = (DateFormatter.iso8601 as? DateFormatter)?.date
         }
+        guard let date = converter?(iso8601) else { return nil }
+        self = date
     }
 }
diff --git a/Sources/PayPal/Utilities/Optional.swift b/Sources/PayPal/Utilities/Optional.swift
new file mode 100644
index 00000000..b18e966c
--- /dev/null
+++ b/Sources/PayPal/Utilities/Optional.swift
@@ -0,0 +1,7 @@
+func ||<T>(optional: @autoclosure ()throws -> T, fallback: T) -> T {
+    do {
+        return try optional()
+    } catch {
+        return fallback
+    }
+}
diff --git a/Tests/PayPalTests/ConfigTests/ProviderTests.swift b/Tests/PayPalTests/ConfigTests/ProviderTests.swift
index fcf782a5..e98e6540 100644
--- a/Tests/PayPalTests/ConfigTests/ProviderTests.swift
+++ b/Tests/PayPalTests/ConfigTests/ProviderTests.swift
@@ -50,3 +50,8 @@ final class ProviderTests: XCTestCase {
     ]
 }
 
+extension PayPalProvider {
+    convenience init() {
+        self.init(id: Env.get("PAYPAL_CLIENT_ID")!, secret: Env.get("PAYPAL_CLIENT_SECRET")!)
+    }
+}
diff --git a/Tests/PayPalTests/ControllerTests/BillingAgreementsTests.swift b/Tests/PayPalTests/ControllerTests/BillingAgreementsTests.swift
index 772cb8a2..d797236c 100644
--- a/Tests/PayPalTests/ControllerTests/BillingAgreementsTests.swift
+++ b/Tests/PayPalTests/ControllerTests/BillingAgreementsTests.swift
@@ -115,7 +115,7 @@ final class BillingAgreementsTests: XCTestCase {
             throw Abort(.internalServerError, reason: "Cannot get agreement ID to get")
         }
         
-        let status = try agreements.setBalance(for: id, amount: .init(currency: .usd, value: "1000")).wait()
+        let status = try agreements.setBalance(for: id, amount: .init(currency: .usd, value: 1000)).wait()
         
         XCTAssertEqual(status, .noContent)
     }
diff --git a/Tests/PayPalTests/ControllerTests/BillingPlansTests.swift b/Tests/PayPalTests/ControllerTests/BillingPlansTests.swift
index 8c79e8a5..5f756ead 100644
--- a/Tests/PayPalTests/ControllerTests/BillingPlansTests.swift
+++ b/Tests/PayPalTests/ControllerTests/BillingPlansTests.swift
@@ -38,7 +38,7 @@ final class BillingPlansTests: XCTestCase {
                     interval: "1",
                     frequency: .month,
                     cycles: "0",
-                    amount: Amount(currency: .usd, value: "10.00"),
+                    amount: CurrencyAmount(currency: .usd, value: 10.00),
                     charges: nil
                 )
             ],
diff --git a/Tests/PayPalTests/ControllerTests/CustomerDiputesTests.swift b/Tests/PayPalTests/ControllerTests/CustomerDiputesTests.swift
index db92e0ec..d972cd76 100644
--- a/Tests/PayPalTests/ControllerTests/CustomerDiputesTests.swift
+++ b/Tests/PayPalTests/ControllerTests/CustomerDiputesTests.swift
@@ -55,7 +55,7 @@ final class CustomerDisputesTests: XCTestCase {
             reason: .policy,
             invoiceID: "3EC9D031-0DBF-446F-ABC0-31B4A6E0D2B5",
             returnAddress: nil,
-            refund: Money(currency: .usd, value: "55.50")
+            refund: CurrencyCodeAmount(currency: .usd, value: 55.50)
         )
         let links = try disputes.accept(claim: id, with: body).wait()
         
@@ -121,7 +121,7 @@ final class CustomerDisputesTests: XCTestCase {
         
         let offer = try CustomerDispute.ResolutionOffer(
             note: "Offer refund with replacement item.",
-            amount: Money(currency: .usd, value: "23"),
+            amount: CurrencyCodeAmount(currency: .usd, value: 23),
             type: .replacement,
             returnAddress: nil,
             invoiceID: nil
diff --git a/Tests/PayPalTests/ControllerTests/InvoicesTests.swift b/Tests/PayPalTests/ControllerTests/InvoicesTests.swift
index 631f6ee5..c93c35a8 100644
--- a/Tests/PayPalTests/ControllerTests/InvoicesTests.swift
+++ b/Tests/PayPalTests/ControllerTests/InvoicesTests.swift
@@ -57,8 +57,8 @@ final class InvoicesTests: XCTestCase {
                         line1: "314 New Berry ln.",
                         line2: nil,
                         city: "Chancer",
-                        state: "KY",
-                        countryCode: "US",
+                        state: .ky,
+                        country: .unitedStates,
                         postalCode: "489156",
                         phone: nil,
                         type: nil
@@ -75,9 +75,9 @@ final class InvoicesTests: XCTestCase {
             reference: "PO number",
             discount: nil,
             shippingCost: nil,
-            custom: CustomAmount(label: "Dough", amount: Amount(currency: .usd, value: "10.00")),
+            custom: CustomAmount(label: "Dough", amount: CurrencyAmount(currency: .usd, value: 10.00)),
             allowPartialPayment: false,
-            minimumDue: Amount(currency: .usd, value: "1.00"),
+            minimumDue: CurrencyAmount(currency: .usd, value: 1.00),
             taxCalculatedAfterDiscount: true,
             taxInclusive: true,
             terms: nil,
@@ -129,9 +129,9 @@ final class InvoicesTests: XCTestCase {
             reference: "PO number",
             discount: nil,
             shippingCost: nil,
-            custom: CustomAmount(label: nil, amount: Amount(currency: .usd, value: "10.00")),
+            custom: CustomAmount(label: nil, amount: CurrencyAmount(currency: .usd, value: 10.00)),
             allowPartialPayment: false,
-            minimumDue: Amount(currency: .usd, value: "1.00"),
+            minimumDue: CurrencyAmount(currency: .usd, value: 1.00),
             taxCalculatedAfterDiscount: true,
             taxInclusive: true,
             terms: nil,
@@ -218,7 +218,7 @@ final class InvoicesTests: XCTestCase {
             throw Abort(.internalServerError, reason: "Cannot get ID for updating invoice")
         }
         
-        let payment = try Invoice.Payment(method: .cash, amount: Amount(currency: .usd, value: "10.00"), date: now, note: "I got the payment by cash!")
+        let payment = Invoice.Payment(method: .cash, amount: CurrencyAmount(currency: .usd, value: 10.00), date: now, note: "I got the payment by cash!")
         let status = try invoices.pay(invoice: id, payment: payment).wait()
         
         XCTAssertEqual(status, .ok)
@@ -231,7 +231,7 @@ final class InvoicesTests: XCTestCase {
             throw Abort(.internalServerError, reason: "Cannot get ID for updating invoice")
         }
         
-        let payment = try Invoice.Payment(amount: Amount(currency: .usd, value: "10.00"), date: now, note: "I refunded the payment of cash")
+        let payment = Invoice.Payment(amount: CurrencyAmount(currency: .usd, value: 10.00), date: now, note: "I refunded the payment of cash")
         let status = try invoices.refund(invoice: id, payment: payment).wait()
         
         XCTAssertEqual(status, .ok)
@@ -291,7 +291,7 @@ final class InvoicesTests: XCTestCase {
         let empty = try invoices.search(with: emptyCriteria).wait()
         
         XCTAssertEqual(list.invoices?.count, 1)
-        XCTAssertGreaterThanOrEqual(list.invoices?.first?.total?.value ?? "0.00", "9.00")
+        XCTAssertGreaterThanOrEqual(list.invoices?.first?.total?.value ?? 0.00, 9.00)
         
         XCTAssertEqual(empty.invoices?.count, 0)
     }
diff --git a/Tests/PayPalTests/ControllerTests/ManagedAccountsTests.swift b/Tests/PayPalTests/ControllerTests/ManagedAccountsTests.swift
index 5a4107f5..5b2292d9 100644
--- a/Tests/PayPalTests/ControllerTests/ManagedAccountsTests.swift
+++ b/Tests/PayPalTests/ControllerTests/ManagedAccountsTests.swift
@@ -48,7 +48,7 @@ final class ManagedAccountsTests: XCTestCase {
             type: .individual,
             subType: .unselected,
             government: GovernmentBody(name: ""),
-            establishment: Establishment(state: "KS", country: "US"),
+            establishment: Establishment(state: .ks, country: .unitedStates),
             names: [],
             ids: [],
             phones: [],
@@ -59,8 +59,8 @@ final class ManagedAccountsTests: XCTestCase {
             registrationDate: TimelessDate(date: "1975-04-22"),
             disputeEmail: EmailAddress(email: "disputable@exmaple.com"),
             sales: .init(
-                price: MoneyRange("50"..."60", currency: .usd),
-                volume: MoneyRange("50"..."60", currency: .usd),
+                price: MoneyRange(50...60, currency: .usd),
+                volume: MoneyRange(50...60, currency: .usd),
                 venues: [],
                 website: "https://example.com",
                 online: PercentRange(0...1)
@@ -71,7 +71,7 @@ final class ManagedAccountsTests: XCTestCase {
                 message: []
             ),
             addresses: [],
-            country: "US",
+            country: .unitedStates,
             stakeholders: [],
             designation: .init(title: "CTO", area: "Software Engineering")
         )
@@ -79,7 +79,7 @@ final class ManagedAccountsTests: XCTestCase {
             email: "business@example.com",
             name: Name(prefix: "Sir", given: "Walter", surname: "Scott", middle: nil, suffix: "Bart.", full: "Sir Walter Scott"),
             relationships: [],
-            country: "UK",
+            country: .unitedKingdom,
             addresses: [],
             birthdate: "1771-08-15",
             language: .en_GB,
@@ -145,7 +145,7 @@ final class ManagedAccountsTests: XCTestCase {
             type: .individual,
             subType: .unselected,
             government: GovernmentBody(name: ""),
-            establishment: Establishment(state: "KS", country: "US"),
+            establishment: Establishment(state: .ks, country: .unitedStates),
             names: [],
             ids: [],
             phones: [],
@@ -156,8 +156,8 @@ final class ManagedAccountsTests: XCTestCase {
             registrationDate: TimelessDate(date: "1975-04-22"),
             disputeEmail: EmailAddress(email: "disputable@exmaple.com"),
             sales: .init(
-                price: MoneyRange("50"..."60", currency: .usd),
-                volume: MoneyRange("50"..."60", currency: .usd),
+                price: MoneyRange(50...60, currency: .usd),
+                volume: MoneyRange(50...60, currency: .usd),
                 venues: [],
                 website: "https://example.com",
                 online: PercentRange(0...1)
@@ -168,7 +168,7 @@ final class ManagedAccountsTests: XCTestCase {
                 message: []
             ),
             addresses: [],
-            country: "US",
+            country: .unitedStates,
             stakeholders: [],
             designation: .init(title: "CTO", area: "Software Engineering")
         )
@@ -176,7 +176,7 @@ final class ManagedAccountsTests: XCTestCase {
             email: "business@example.com",
             name: Name(prefix: "Sir", given: "Walter", surname: "Scott", middle: nil, suffix: "Bart.", full: "Sir Walter Scott"),
             relationships: [],
-            country: "UK",
+            country: .unitedKingdom,
             addresses: [],
             birthdate: "1771-08-15",
             language: .en_GB,
diff --git a/Tests/PayPalTests/ControllerTests/OrdersTests.swift b/Tests/PayPalTests/ControllerTests/OrdersTests.swift
index 90988021..608f2bdf 100644
--- a/Tests/PayPalTests/ControllerTests/OrdersTests.swift
+++ b/Tests/PayPalTests/ControllerTests/OrdersTests.swift
@@ -26,18 +26,18 @@ final class OrdersTests: XCTestCase {
     }
     
     func testCreateEndpoints()throws {
-        let sales = try [
-            Sale(amount: DetailedAmount(currency: .usd, total: "150.78", details:
+        let sales = [
+            Sale(amount: DetailedAmount(currency: .usd, total: 150.78, details:
                 DetailedAmount.Detail(
-                    subtotal: "140.00",
-                    shipping: "9.00",
-                    tax: "1.78",
+                    subtotal: 140.00,
+                    shipping: 9.00,
+                    tax: 1.78,
                     handlingFee: nil,
                     shippingDiscount: nil,
                     insurance: nil,
                     giftWrap: nil)
                 ),
-                transaction: Amount(currency: .usd, value: "1.50")
+                transaction: CurrencyAmount(currency: .usd, value: 1.50)
             )
         ]
         
@@ -46,7 +46,7 @@ final class OrdersTests: XCTestCase {
             units: [
                 Order.Unit(
                     reference: "FB68DC33-FA23-44D4-B197-C9251D76286E",
-                    amount: DetailedAmount(currency: .usd, total: "140.00", details: nil),
+                    amount: DetailedAmount(currency: .usd, total: 140.00, details: nil),
                     payee: Payee(email: "payee@example.com", merchant: nil, metadata: nil),
                     description: "Unit",
                     invoice: "FB68DC33-FA23-44D4-B197-C9251D76286E",
@@ -70,8 +70,8 @@ final class OrdersTests: XCTestCase {
                         line1: "648 New Borne St.",
                         line2: nil,
                         city: "Armagedon",
-                        state: "IL",
-                        countryCode: "US",
+                        state: .il,
+                        country: .unitedStates,
                         postalCode: "456813",
                         phone: nil,
                         type: nil
@@ -130,7 +130,7 @@ final class OrdersTests: XCTestCase {
                 funding: [
                     FundingInstrument(token: CreditCard.Token(creditCard: "C324C867-B0D8-4522-881E-6D788A159DB4", payer: "C324C867-B0D8-4522-881E-6D788A159DB4"))
                 ],
-                info: Order.Payer.Info(email: "email@example.com", birthdate: nil, tax: nil, taxType: nil, country: "US", billing: nil)
+                info: Order.Payer.Info(email: "email@example.com", birthdate: nil, tax: nil, taxType: nil, country: .unitedStates, billing: nil)
             )
         )
         
diff --git a/Tests/PayPalTests/ControllerTests/PaymentsTests.swift b/Tests/PayPalTests/ControllerTests/PaymentsTests.swift
index 87735726..535fef71 100644
--- a/Tests/PayPalTests/ControllerTests/PaymentsTests.swift
+++ b/Tests/PayPalTests/ControllerTests/PaymentsTests.swift
@@ -80,8 +80,8 @@ final class PaymentsTests: XCTestCase {
     
     func testExecuteEndpoint()throws {
         let payments = try self.app.make(Payments.self)
-        let amounts = try [
-            DetailedAmount(currency: .usd, total: "150.00", details: nil)
+        let amounts = [
+            DetailedAmount(currency: .usd, total: 150.00, details: nil)
         ]
         
         let details = try payments.execute(payment: self.id, with: Payment.Executor(payer: nil, amounts: amounts)).wait()
@@ -128,7 +128,7 @@ final class PaymentsTests: XCTestCase {
             throw Abort(.internalServerError, reason: "Cannot get authorization ID")
         }
         let capture = try RelatedResource.Capture(
-            amount: DetailedAmount(currency: .usd, total: "5.60", details: nil),
+            amount: DetailedAmount(currency: .usd, total: 5.60, details: nil),
             isFinal: true,
             invoice: nil,
             transaction: nil,
@@ -145,8 +145,8 @@ final class PaymentsTests: XCTestCase {
         guard let id = self.context.authorization else {
             throw Abort(.internalServerError, reason: "Cannot get authorization ID")
         }
-        let auth = try RelatedResource.Authorization(
-            amount: DetailedAmount(currency: .usd, total: "5.60", details: nil),
+        let auth = RelatedResource.Authorization(
+            amount: DetailedAmount(currency: .usd, total: 5.60, details: nil),
             fmf: FraudManagementFilter(type: .pending, id: .unconfirmedAddress, name: "Unconfirmed Shipping Address", description: nil),
             processor: nil
         )
@@ -183,8 +183,8 @@ final class PaymentsTests: XCTestCase {
         guard let id = self.context.order else {
             throw Abort(.internalServerError, reason: "Cannot get order ID")
         }
-        let auth = try RelatedResource.Authorization(
-            amount: DetailedAmount(currency: .usd, total: "5.60", details: nil),
+        let auth = RelatedResource.Authorization(
+            amount: DetailedAmount(currency: .usd, total: 5.60, details: nil),
             fmf: FraudManagementFilter(type: .pending, id: .unconfirmedAddress, name: "Unconfirmed Shipping Address", description: nil),
             processor: nil
         )
@@ -201,7 +201,7 @@ final class PaymentsTests: XCTestCase {
             throw Abort(.internalServerError, reason: "Cannot get order ID")
         }
         let capture = try RelatedResource.Capture(
-            amount: DetailedAmount(currency: .usd, total: "5.60", details: nil),
+            amount: DetailedAmount(currency: .usd, total: 5.60, details: nil),
             isFinal: true,
             invoice: nil,
             transaction: nil,
@@ -298,14 +298,14 @@ internal struct PaymentTestsContext {
     private(set) var payment: String?
     
     init()throws {
-        self.address = try Address(
+        self.address = Address(
             recipientName: "Ira Harding",
             defaultAddress: true,
             line1: "578 Wild Wood",
             line2: nil,
             city: "New Haven",
-            state: "CN",
-            countryCode: "US",
+            state: .co,
+            country: .unitedStates,
             postalCode: "79812",
             phone: nil,
             type: nil
@@ -319,16 +319,16 @@ internal struct PaymentTestsContext {
             description: "With sugar an inch thick",
             tax: "8.00"
         )
-        self.details = try DetailedAmount.Detail(
-            subtotal: "117.00",
-            shipping: "15.00",
-            tax: "8.00",
-            handlingFee: "10.00",
+        self.details = DetailedAmount.Detail(
+            subtotal: 117.00,
+            shipping: 15.00,
+            tax: 8.00,
+            handlingFee: 10.00,
             shippingDiscount: nil,
             insurance: nil,
             giftWrap: nil
         )
-        self.amount = try DetailedAmount(currency: .usd, total: "150.00", details: details)
+        self.amount = DetailedAmount(currency: .usd, total: 150.00, details: details)
         self.items = try Payment.ItemList(
             items: [item],
             address: nil,
diff --git a/Tests/PayPalTests/ControllerTests/TemplatesTests.swift b/Tests/PayPalTests/ControllerTests/TemplatesTests.swift
index f802451e..90f48be8 100644
--- a/Tests/PayPalTests/ControllerTests/TemplatesTests.swift
+++ b/Tests/PayPalTests/ControllerTests/TemplatesTests.swift
@@ -52,9 +52,9 @@ final class TemplatesTests: XCTestCase {
                 reference: "PO number",
                 discount: nil,
                 shippingCost: nil,
-                custom: CustomAmount(label: nil, amount: Amount(currency: .usd, value: "10.00")),
+                custom: CustomAmount(label: nil, amount: CurrencyAmount(currency: .usd, value: 10.00)),
                 allowPartialPayment: false,
-                minimumDue: Amount(currency: .usd, value: "1.00"),
+                minimumDue: CurrencyAmount(currency: .usd, value: 1.00),
                 taxCalculatedAfterDiscount: true,
                 taxInclusive: true,
                 terms: nil,
@@ -115,9 +115,9 @@ final class TemplatesTests: XCTestCase {
                 reference: "PO number",
                 discount: nil,
                 shippingCost: nil,
-                custom: CustomAmount(label: nil, amount: Amount(currency: .usd, value: "10.00")),
+                custom: CustomAmount(label: nil, amount: CurrencyAmount(currency: .usd, value: 10.00)),
                 allowPartialPayment: false,
-                minimumDue: Amount(currency: .usd, value: "1.00"),
+                minimumDue: CurrencyAmount(currency: .usd, value: 1.00),
                 taxCalculatedAfterDiscount: true,
                 taxInclusive: true,
                 terms: nil,
diff --git a/Tests/PayPalTests/ModelTests/AcceptDisputeTests.swift b/Tests/PayPalTests/ModelTests/AcceptDisputeTests.swift
index 736d0dc6..4600e3e5 100644
--- a/Tests/PayPalTests/ModelTests/AcceptDisputeTests.swift
+++ b/Tests/PayPalTests/ModelTests/AcceptDisputeTests.swift
@@ -8,14 +8,14 @@ final class AcceptDisputeTests: XCTestCase {
             reason: .policy,
             invoiceID: "3EC9D031-0DBF-446F-ABC0-31B4A6E0D2B5",
             returnAddress: nil,
-            refund: Money(currency: .usd, value: "55.50")
+            refund: CurrencyCodeAmount(currency: .usd, value: 55.50)
         )
         
         XCTAssertNil(body.returnAddress)
         XCTAssertEqual(body.note, "Refund to customer")
         XCTAssertEqual(body.reason, .policy)
         XCTAssertEqual(body.invoiceID, "3EC9D031-0DBF-446F-ABC0-31B4A6E0D2B5")
-        try XCTAssertEqual(body.refund, Money(currency: .usd, value: "55.50"))
+        XCTAssertEqual(body.refund, CurrencyCodeAmount(currency: .usd, value: 55.50))
     }
     
     func testValidations()throws {
@@ -24,14 +24,14 @@ final class AcceptDisputeTests: XCTestCase {
             reason: .policy,
             invoiceID: "3EC9D031-0DBF-446F-ABC0-31B4A6E0D2B5",
             returnAddress: nil,
-            refund: Money(currency: .usd, value: "55.50")
+            refund: CurrencyCodeAmount(currency: .usd, value: 55.50)
         ))
         var body = try AcceptDisputeBody(
             note: "Refund to customer",
             reason: .policy,
             invoiceID: "3EC9D031-0DBF-446F-ABC0-31B4A6E0D2B5",
             returnAddress: nil,
-            refund: Money(currency: .usd, value: "55.50")
+            refund: CurrencyCodeAmount(currency: .usd, value: 55.50)
         )
         
         try XCTAssertThrowsError(body.set(\AcceptDisputeBody.note <~ String(repeating: "n", count: 2001)))
@@ -47,7 +47,7 @@ final class AcceptDisputeTests: XCTestCase {
             reason: .policy,
             invoiceID: "3EC9D031-0DBF-446F-ABC0-31B4A6E0D2B5",
             returnAddress: nil,
-            refund: Money(currency: .usd, value: "55.50")
+            refund: CurrencyCodeAmount(currency: .usd, value: 55.50)
         )
         let generated = try String(data: encoder.encode(body), encoding: .utf8)!
         let json =
@@ -71,7 +71,7 @@ final class AcceptDisputeTests: XCTestCase {
             reason: .policy,
             invoiceID: "3EC9D031-0DBF-446F-ABC0-31B4A6E0D2B5",
             returnAddress: nil,
-            refund: Money(currency: .usd, value: "55.50")
+            refund: CurrencyCodeAmount(currency: .usd, value: 55.50)
         )
         let valid = """
         {
diff --git a/Tests/PayPalTests/ModelTests/AccountOwnerRelationshipTests.swift b/Tests/PayPalTests/ModelTests/AccountOwnerRelationshipTests.swift
index d6db8078..8c19e05c 100644
--- a/Tests/PayPalTests/ModelTests/AccountOwnerRelationshipTests.swift
+++ b/Tests/PayPalTests/ModelTests/AccountOwnerRelationshipTests.swift
@@ -5,35 +5,19 @@ final class AccountOwnerRelationshipTests: XCTestCase {
     func testInit()throws {
         let relationship = try AccountOwnerRelationship(
             name: Name(prefix: nil, given: "Abe", surname: "Lincon", middle: nil, suffix: nil, full: "Abe Lincon"),
-            country: "US"
+            country: .unitedStates
         )
         
         XCTAssertEqual(relationship.relation, "MOTHER")
-        XCTAssertEqual(relationship.country, "US")
+        XCTAssertEqual(relationship.country, .unitedStates)
         try XCTAssertEqual(relationship.name, Name(prefix: nil, given: "Abe", surname: "Lincon", middle: nil, suffix: nil, full: "Abe Lincon"))
     }
     
-    func testValidations()throws {
-        try XCTAssertThrowsError(AccountOwnerRelationship(
-            name: Name(prefix: nil, given: "Abe", surname: "Lincon", middle: nil, suffix: nil, full: "Abe Lincon"),
-            country: "usa"
-        ))
-        var relationship = try AccountOwnerRelationship(
-            name: Name(prefix: nil, given: "Abe", surname: "Lincon", middle: nil, suffix: nil, full: "Abe Lincon"),
-            country: "US"
-        )
-        
-        try XCTAssertThrowsError(relationship.set(\.country <~ "usa"))
-        try relationship.set(\.country <~ "UK")
-        
-        XCTAssertEqual(relationship.country, "UK")
-    }
-    
     func testEncoding()throws {
         let encoder = JSONEncoder()
         let relationship = try AccountOwnerRelationship(
             name: Name(prefix: nil, given: "Abe", surname: "Lincon", middle: nil, suffix: nil, full: "Abe Lincon"),
-            country: "US"
+            country: .unitedStates
         )
         let generated = try String(data: encoder.encode(relationship), encoding: .utf8)!
         let json =
@@ -53,7 +37,7 @@ final class AccountOwnerRelationshipTests: XCTestCase {
         let decoder = JSONDecoder()
         let relationship = try AccountOwnerRelationship(
             name: Name(prefix: nil, given: "Abe", surname: "Lincon", middle: nil, suffix: nil, full: "Abe Lincon"),
-            country: "US"
+            country: .unitedStates
         )
         let json = """
         {
@@ -84,7 +68,6 @@ final class AccountOwnerRelationshipTests: XCTestCase {
     
     static var allTests: [(String, (AccountOwnerRelationshipTests) -> ()throws -> ())] = [
         ("testInit", testInit),
-        ("testValidations", testValidations),
         ("testEncoding", testEncoding),
         ("testDecoding", testDecoding)
     ]
diff --git a/Tests/PayPalTests/ModelTests/ActivitiesResponseTests.swift b/Tests/PayPalTests/ModelTests/ActivityResponseTests.swift
similarity index 84%
rename from Tests/PayPalTests/ModelTests/ActivitiesResponseTests.swift
rename to Tests/PayPalTests/ModelTests/ActivityResponseTests.swift
index 665c7f71..9fefb1f0 100644
--- a/Tests/PayPalTests/ModelTests/ActivitiesResponseTests.swift
+++ b/Tests/PayPalTests/ModelTests/ActivityResponseTests.swift
@@ -2,8 +2,8 @@ import XCTest
 @testable import PayPal
 
 @available(OSX 10.12, *)
-final class ActivitiesResponseTests: XCTestCase {
-    let response = ActivitiesResponse(items: [
+final class ActivityResponseTests: XCTestCase {
+    let response = Activity.Response(items: [
             Activity(
                 id: "94C67654-A41B-4421-B0D0-81E6CD587CDB",
                 timeCreated: "2018-07-12T14:14:56Z",
@@ -16,14 +16,8 @@ final class ActivitiesResponseTests: XCTestCase {
                     name: "Jonathan Futher"
                 ),
                 fee: nil,
-                gross: try! Money(
-                    currency: .usd,
-                    value: "19.45"
-                ),
-                net: try! Money(
-                    currency: .usd,
-                    value: "19.45"
-                ),
+                gross: CurrencyCodeAmount(currency: .usd, value: 19.45),
+                net: CurrencyCodeAmount(currency: .usd, value: 19.45),
                 partnerFee: nil,
                 extensions: nil
             )
@@ -47,14 +41,8 @@ final class ActivitiesResponseTests: XCTestCase {
                     name: "Jonathan Futher"
                 ),
                 fee: nil,
-                gross: try! Money(
-                    currency: .usd,
-                    value: "19.45"
-                ),
-                net: try! Money(
-                    currency: .usd,
-                    value: "19.45"
-                ),
+                gross: CurrencyCodeAmount(currency: .usd, value: 19.45),
+                net: CurrencyCodeAmount(currency: .usd, value: 19.45),
                 partnerFee: nil,
                 extensions: nil
             )
@@ -124,12 +112,12 @@ final class ActivitiesResponseTests: XCTestCase {
         }
         """.data(using: .utf8)!
 
-        let decoded = try decoder.decode(ActivitiesResponse.self, from: ext)
+        let decoded = try decoder.decode(Activity.Response.self, from: ext)
 
         XCTAssertEqual(self.response, decoded)
     }
     
-    static var allTests: [(String, (ActivitiesResponseTests) -> ()throws -> ())] = [
+    static var allTests: [(String, (ActivityResponseTests) -> ()throws -> ())] = [
         ("testInit", testInit),
         ("testEncoding", testEncoding),
         ("testDecoding", testDecoding)
diff --git a/Tests/PayPalTests/ModelTests/ActivityTests.swift b/Tests/PayPalTests/ModelTests/ActivityTests.swift
index 1db8c3ad..755e46bc 100644
--- a/Tests/PayPalTests/ModelTests/ActivityTests.swift
+++ b/Tests/PayPalTests/ModelTests/ActivityTests.swift
@@ -2,7 +2,7 @@ import XCTest
 @testable import PayPal
 
 final class ActivityTests: XCTestCase {
-    let activity = try! Activity(
+    let activity = Activity(
         id: "94C67654-A41B-4421-B0D0-81E6CD587CDB",
         timeCreated: "2018-07-12T14:14:56Z",
         type: .payment,
@@ -14,14 +14,8 @@ final class ActivityTests: XCTestCase {
             name: "Jonathan Futher"
         ),
         fee: nil,
-        gross: Money(
-            currency: .usd,
-            value: "19.45"
-        ),
-        net: Money(
-            currency: .usd,
-            value: "19.45"
-        ),
+        gross: CurrencyCodeAmount(currency: .usd, value: 19.45),
+        net: CurrencyCodeAmount(currency: .usd, value: 19.45),
         partnerFee: nil,
         extensions: nil
     )
diff --git a/Tests/PayPalTests/ModelTests/AddressTests.swift b/Tests/PayPalTests/ModelTests/AddressTests.swift
index 48935d5e..50a93aa8 100644
--- a/Tests/PayPalTests/ModelTests/AddressTests.swift
+++ b/Tests/PayPalTests/ModelTests/AddressTests.swift
@@ -3,14 +3,14 @@ import XCTest
 
 final class AddressTests: XCTestCase {
     func testInit()throws {
-        let address = try Address(
+        let address = Address(
             recipientName: "Puffin Billy",
             defaultAddress: true,
             line1: "89 Furnace Dr.",
             line2: nil,
             city: "Nowhere",
-            state: "KS",
-            countryCode: "US",
+            state: .ks,
+            country: .unitedStates,
             postalCode: "66167",
             phone: nil,
             type: nil
@@ -21,86 +21,23 @@ final class AddressTests: XCTestCase {
         XCTAssertEqual(address.line1, "89 Furnace Dr.")
         XCTAssertEqual(address.line2, nil)
         XCTAssertEqual(address.city, "Nowhere")
-        XCTAssertEqual(address.state, "KS")
-        XCTAssertEqual(address.countryCode, "US")
+        XCTAssertEqual(address.state, .ks)
+        XCTAssertEqual(address.country, .unitedStates)
         XCTAssertEqual(address.postalCode, "66167")
         XCTAssertEqual(address.phone, nil)
         XCTAssertEqual(address.type, nil)
     }
     
-    func testValueValidation()throws {
-        try XCTAssertThrowsError(Address(
-            recipientName: "Puffin Billy",
-            defaultAddress: true,
-            line1: "89 Furnace Dr.",
-            line2: nil,
-            city: "Nowhere",
-            state: "KS",
-            countryCode: "22",
-            postalCode: "66167",
-            phone: nil,
-            type: nil
-        ))
-        try XCTAssertThrowsError(Address(
-            recipientName: "Puffin Billy",
-            defaultAddress: true,
-            line1: "89 Furnace Dr.",
-            line2: nil,
-            city: "Nowhere",
-            state: "KS",
-            countryCode: "USA",
-            postalCode: "66167",
-            phone: nil,
-            type: nil
-        ))
-        try XCTAssertThrowsError(Address(
-            recipientName: "Puffin Billy",
-            defaultAddress: true,
-            line1: "89 Furnace Dr.",
-            line2: nil,
-            city: "Nowhere",
-            state: String(repeating: "j", count: 41),
-            countryCode: "US",
-            postalCode: "66167",
-            phone: nil,
-            type: nil
-        ))
-        
-        var test = try Address(
-            recipientName: "Puffin Billy",
-            defaultAddress: true,
-            line1: "89 Furnace Dr.",
-            line2: nil,
-            city: "Nowhere",
-            state: "KS",
-            countryCode: "US",
-            postalCode: "66167",
-            phone: nil,
-            type: nil
-        )
-        
-        try XCTAssertThrowsError(test.set(\Address.state <~ String(repeating: "KS", count: 22)))
-        try XCTAssertThrowsError(test.set(\.countryCode <~ "US@"))
-        
-        try test.set(\.state <~ "ON")
-        try test.set(\.countryCode <~ "CA")
-        test.city = "Somewhere"
-        
-        XCTAssertEqual(test.state, "ON")
-        XCTAssertEqual(test.countryCode, "CA")
-        XCTAssertEqual(test.city, "Somewhere")
-    }
-    
     func testEncoding()throws {
         let encoder = JSONEncoder()
-        let address = try Address(
+        let address = Address(
             recipientName: "Puffin Billy",
             defaultAddress: true,
             line1: "89 Furnace Dr.",
             line2: nil,
             city: "Nowhere",
-            state: "KS",
-            countryCode: "US",
+            state: .ks,
+            country: .unitedStates,
             postalCode: "66167",
             phone: nil,
             type: nil
@@ -166,8 +103,8 @@ final class AddressTests: XCTestCase {
                 line1: "89 Furnace Dr.",
                 line2: nil,
                 city: "Nowhere",
-                state: "KS",
-                countryCode: "US",
+                state: .ks,
+                country: .unitedStates,
                 postalCode: "66167",
                 phone: nil,
                 type: nil
@@ -178,7 +115,6 @@ final class AddressTests: XCTestCase {
     
     static var allTests: [(String, (AddressTests) -> ()throws -> ())] = [
         ("testInit", testInit),
-        ("testValueValidation", testValueValidation),
         ("testEncoding", testEncoding),
         ("testDecoding", testDecoding)
     ]
diff --git a/Tests/PayPalTests/ModelTests/AdjudicationOutcomeTests.swift b/Tests/PayPalTests/ModelTests/AdjudicationOutcomeTests.swift
index 94332945..15fa5449 100644
--- a/Tests/PayPalTests/ModelTests/AdjudicationOutcomeTests.swift
+++ b/Tests/PayPalTests/ModelTests/AdjudicationOutcomeTests.swift
@@ -2,10 +2,6 @@ import XCTest
 @testable import PayPal
 
 final class AdjudicationOutcomeTests: XCTestCase {
-    struct CC: Codable {
-        let state: CreditCardState
-    }
-    
     struct Adjudication: Codable {
         let outcome: AdjudicationOutcome
     }
diff --git a/Tests/PayPalTests/ModelTests/BalanceResponseTests.swift b/Tests/PayPalTests/ModelTests/BalanceResponseTests.swift
index 284fe820..8b71c88d 100644
--- a/Tests/PayPalTests/ModelTests/BalanceResponseTests.swift
+++ b/Tests/PayPalTests/ModelTests/BalanceResponseTests.swift
@@ -23,8 +23,8 @@ final class BalanceResponseTests: XCTestCase {
         
         let response = try JSONDecoder().decode(BalanceResponse.self, from: json)
         XCTAssertEqual(response.payer, "12D54EFB-D12F-4AF8-B5BF-AC62FFE253CC")
-        try XCTAssertEqual(response.available, [Money(currency: .usd, value: "1000000.00")])
-        try XCTAssertEqual(response.pending, [Money(currency: .usd, value: "5000.00")])
+        XCTAssertEqual(response.available, [CurrencyCodeAmount(currency: .usd, value: 1000000.00)])
+        XCTAssertEqual(response.pending, [CurrencyCodeAmount(currency: .usd, value: 5000.00)])
     }
     
     static var allTests: [(String, (BalanceResponseTests) -> ()throws -> ())] = [
diff --git a/Tests/PayPalTests/ModelTests/BillingInfoTests.swift b/Tests/PayPalTests/ModelTests/BillingInfoTests.swift
index e539b9d7..752c84cb 100644
--- a/Tests/PayPalTests/ModelTests/BillingInfoTests.swift
+++ b/Tests/PayPalTests/ModelTests/BillingInfoTests.swift
@@ -16,7 +16,7 @@ final class BillingInfoTests: XCTestCase {
                 line2: nil,
                 city: "London",
                 state: nil,
-                countryCode: "UK",
+                country: .unitedKingdom,
                 postalCode: "42",
                 phone: nil,
                 type: nil
@@ -33,14 +33,14 @@ final class BillingInfoTests: XCTestCase {
         XCTAssertEqual(info.info, "For the captain.")
         
         try XCTAssertEqual(info.phone, PhoneNumber(country: "1", number: "4586901518"))
-        try XCTAssertEqual(info.address, Address(
+        XCTAssertEqual(info.address, Address(
             recipientName: nil,
             defaultAddress: true,
             line1: "3rd Celler, Baker Street",
             line2: nil,
             city: "London",
             state: nil,
-            countryCode: "UK",
+            country: .unitedKingdom,
             postalCode: "42",
             phone: nil,
             type: nil
diff --git a/Tests/PayPalTests/ModelTests/BillingPaymentTests.swift b/Tests/PayPalTests/ModelTests/BillingPaymentTests.swift
index eb2c711f..df689dcf 100644
--- a/Tests/PayPalTests/ModelTests/BillingPaymentTests.swift
+++ b/Tests/PayPalTests/ModelTests/BillingPaymentTests.swift
@@ -9,7 +9,7 @@ final class BillingPaymentTests: XCTestCase {
             interval: "2",
             frequency: .month,
             cycles: "0",
-            amount: Money(currency: .usd, value: "24.99"),
+            amount: CurrencyCodeAmount(currency: .usd, value: 24.99),
             charges: nil
         )
         
@@ -20,7 +20,7 @@ final class BillingPaymentTests: XCTestCase {
         XCTAssertEqual(payment.frequency, .month)
         XCTAssertEqual(payment.cycles, "0")
         XCTAssertEqual(payment.charges, nil)
-        try XCTAssertEqual(payment.amount, Money(currency: .usd, value: "24.99"))
+        XCTAssertEqual(payment.amount, CurrencyCodeAmount(currency: .usd, value: 24.99))
         
         try XCTAssertThrowsError(BillingPayment(
             name: "Service Membership",
@@ -28,7 +28,7 @@ final class BillingPaymentTests: XCTestCase {
             interval: "i",
             frequency: .month,
             cycles: "0",
-            amount: Money(currency: .usd, value: "24.99"),
+            amount: CurrencyCodeAmount(currency: .usd, value: 24.99),
             charges: nil
         ))
         try XCTAssertThrowsError(BillingPayment(
@@ -37,7 +37,7 @@ final class BillingPaymentTests: XCTestCase {
             interval: "i",
             frequency: .month,
             cycles: "y",
-            amount: Money(currency: .usd, value: "24.99"),
+            amount: CurrencyCodeAmount(currency: .usd, value: 24.99),
             charges: nil
         ))
         try XCTAssertThrowsError(BillingPayment(
@@ -46,7 +46,7 @@ final class BillingPaymentTests: XCTestCase {
             interval: "13",
             frequency: .month,
             cycles: "0",
-            amount: Money(currency: .usd, value: "24.99"),
+            amount: CurrencyCodeAmount(currency: .usd, value: 24.99),
             charges: nil
         ))
     }
@@ -59,7 +59,7 @@ final class BillingPaymentTests: XCTestCase {
             interval: "2",
             frequency: .month,
             cycles: "0",
-            amount: Money(currency: .usd, value: "24.99"),
+            amount: CurrencyCodeAmount(currency: .usd, value: 24.99),
             charges: nil
         )
         let generated = try String(data: encoder.encode(payment), encoding: .utf8)!
@@ -85,7 +85,7 @@ final class BillingPaymentTests: XCTestCase {
             interval: "2",
             frequency: .month,
             cycles: "0",
-            amount: Money(currency: .usd, value: "24.99"),
+            amount: CurrencyCodeAmount(currency: .usd, value: 24.99),
             charges: nil
         )
         
@@ -129,9 +129,9 @@ final class BillingPaymentTests: XCTestCase {
         }
         """.data(using: .utf8)!
         
-        try XCTAssertEqual(payment, decoder.decode(BillingPayment<Money>.self, from: valid))
-        try XCTAssertThrowsError(decoder.decode(BillingPayment<Money>.self, from: cyclesError))
-        try XCTAssertThrowsError(decoder.decode(BillingPayment<Money>.self, from: intervalError))
+        try XCTAssertEqual(payment, decoder.decode(BillingPayment<CurrencyCodeAmount>.self, from: valid))
+        try XCTAssertThrowsError(decoder.decode(BillingPayment<CurrencyCodeAmount>.self, from: cyclesError))
+        try XCTAssertThrowsError(decoder.decode(BillingPayment<CurrencyCodeAmount>.self, from: intervalError))
     }
     
     static var allTests: [(String, (BillingPaymentTests) -> ()throws -> ())] = [
diff --git a/Tests/PayPalTests/ModelTests/BillingPlanListTests.swift b/Tests/PayPalTests/ModelTests/BillingPlanListTests.swift
index d10a5aa3..8b0a4595 100644
--- a/Tests/PayPalTests/ModelTests/BillingPlanListTests.swift
+++ b/Tests/PayPalTests/ModelTests/BillingPlanListTests.swift
@@ -3,7 +3,7 @@ import XCTest
 
 final class BillingPlanListTests: XCTestCase {
     func testInit()throws {
-        let list = try BillingPlanList(plans: [
+        let list = try BillingPlan.List(plans: [
             BillingPlan(
                 name: "Monthly Water",
                 description: "Your water payment",
@@ -15,7 +15,7 @@ final class BillingPlanListTests: XCTestCase {
                         interval: "1",
                         frequency: .month,
                         cycles: "0",
-                        amount: Amount(currency: .usd, value: "10.00"),
+                        amount: CurrencyAmount(currency: .usd, value: 10.00),
                         charges: nil
                     )
                 ],
@@ -36,7 +36,7 @@ final class BillingPlanListTests: XCTestCase {
                     interval: "1",
                     frequency: .month,
                     cycles: "0",
-                    amount: Amount(currency: .usd, value: "10.00"),
+                    amount: CurrencyAmount(currency: .usd, value: 10.00),
                     charges: nil
                 )
             ],
@@ -46,7 +46,7 @@ final class BillingPlanListTests: XCTestCase {
     
     func testEncoding()throws {
         let encoder = JSONEncoder()
-        let list = try BillingPlanList(plans: [
+        let list = try BillingPlan.List(plans: [
             BillingPlan(
                 name: "Monthly Water",
                 description: "Your water payment",
@@ -58,7 +58,7 @@ final class BillingPlanListTests: XCTestCase {
                         interval: "1",
                         frequency: .month,
                         cycles: "0",
-                        amount: Amount(currency: .usd, value: "10.00"),
+                        amount: CurrencyAmount(currency: .usd, value: 10.00),
                         charges: nil
                     )
                 ],
@@ -110,7 +110,7 @@ final class BillingPlanListTests: XCTestCase {
             ]
         }
         """.data(using: .utf8)!
-        let plan = try decoder.decode(BillingPlanList.self, from: json)
+        let plan = try decoder.decode(BillingPlan.List.self, from: json)
         
         XCTAssertEqual(plan.pages, "1")
         XCTAssertEqual(plan.items, "1")
@@ -127,7 +127,7 @@ final class BillingPlanListTests: XCTestCase {
                     interval: "1",
                     frequency: .month,
                     cycles: "0",
-                    amount: Amount(currency: .usd, value: "10.00"),
+                    amount: CurrencyAmount(currency: .usd, value: 10.00),
                     charges: nil
                 )
             ],
diff --git a/Tests/PayPalTests/ModelTests/BillingPlanTests.swift b/Tests/PayPalTests/ModelTests/BillingPlanTests.swift
index ffb420e8..8c8c56f4 100644
--- a/Tests/PayPalTests/ModelTests/BillingPlanTests.swift
+++ b/Tests/PayPalTests/ModelTests/BillingPlanTests.swift
@@ -14,7 +14,7 @@ final class BillingPlanTests: XCTestCase {
                     interval: "1",
                     frequency: .month,
                     cycles: "0",
-                    amount: Amount(currency: .usd, value: "10.00"),
+                    amount: CurrencyAmount(currency: .usd, value: 10.00),
                     charges: nil
                 )
             ],
@@ -39,7 +39,7 @@ final class BillingPlanTests: XCTestCase {
             interval: "1",
             frequency: .month,
             cycles: "0",
-            amount: Amount(currency: .usd, value: "10.00"),
+            amount: CurrencyAmount(currency: .usd, value: 10.00),
             charges: nil
         ))
     }
@@ -71,7 +71,7 @@ final class BillingPlanTests: XCTestCase {
                     interval: "1",
                     frequency: .month,
                     cycles: "0",
-                    amount: Amount(currency: .usd, value: "10.00"),
+                    amount: CurrencyAmount(currency: .usd, value: 10.00),
                     charges: nil
                 )
             ],
@@ -103,7 +103,7 @@ final class BillingPlanTests: XCTestCase {
                     interval: "1",
                     frequency: .month,
                     cycles: "0",
-                    amount: Amount(currency: .usd, value: "10.00"),
+                    amount: CurrencyAmount(currency: .usd, value: 10.00),
                     charges: nil
                 )
             ],
diff --git a/Tests/PayPalTests/ModelTests/BusinessOwnerAddress.swift b/Tests/PayPalTests/ModelTests/BusinessOwnerAddress.swift
index cd715dc6..ca872039 100644
--- a/Tests/PayPalTests/ModelTests/BusinessOwnerAddress.swift
+++ b/Tests/PayPalTests/ModelTests/BusinessOwnerAddress.swift
@@ -10,8 +10,8 @@ final class BusinessOwnerAddressTests: XCTestCase {
             line3: nil,
             suburb: "Invisible Winds",
             city: "Nowhere",
-            state: "KS",
-            country: "US",
+            state: .ks,
+            country: .unitedStates,
             postalCode: "66167"
         )
         
@@ -21,8 +21,8 @@ final class BusinessOwnerAddressTests: XCTestCase {
         XCTAssertEqual(address.line1, "89 Furnace Dr.")
         XCTAssertEqual(address.suburb, "Invisible Winds")
         XCTAssertEqual(address.city, "Nowhere")
-        XCTAssertEqual(address.state, "KS")
-        XCTAssertEqual(address.country, "US")
+        XCTAssertEqual(address.state, .ks)
+        XCTAssertEqual(address.country, .unitedStates)
         XCTAssertEqual(address.postalCode, "66167")
     }
     
@@ -34,8 +34,8 @@ final class BusinessOwnerAddressTests: XCTestCase {
             line3: nil,
             suburb: "Invisible Winds",
             city: "Nowhere",
-            state: "KS",
-            country: "US",
+            state: .ks,
+            country: .unitedStates,
             postalCode: "66167"
         ))
         try XCTAssertThrowsError(BusinessOwner.Address(
@@ -45,8 +45,8 @@ final class BusinessOwnerAddressTests: XCTestCase {
             line3: nil,
             suburb: "Invisible Winds",
             city: "Nowhere",
-            state: "KS",
-            country: "US",
+            state: .ks,
+            country: .unitedStates,
             postalCode: "66167"
         ))
         try XCTAssertThrowsError(BusinessOwner.Address(
@@ -56,8 +56,8 @@ final class BusinessOwnerAddressTests: XCTestCase {
             line3: String(repeating: "l", count: 301),
             suburb: "Invisible Winds",
             city: "Nowhere",
-            state: "KS",
-            country: "US",
+            state: .ks,
+            country: .unitedStates,
             postalCode: "66167"
         ))
         try XCTAssertThrowsError(BusinessOwner.Address(
@@ -67,8 +67,8 @@ final class BusinessOwnerAddressTests: XCTestCase {
             line3: nil,
             suburb: String(repeating: "l", count: 301),
             city: "Nowhere",
-            state: "KS",
-            country: "US",
+            state: .ks,
+            country: .unitedStates,
             postalCode: "66167"
         ))
         try XCTAssertThrowsError(BusinessOwner.Address(
@@ -78,30 +78,8 @@ final class BusinessOwnerAddressTests: XCTestCase {
             line3: nil,
             suburb: "Invisible Winds",
             city: String(repeating: "l", count: 121),
-            state: "KS",
-            country: "US",
-            postalCode: "66167"
-        ))
-        try XCTAssertThrowsError(BusinessOwner.Address(
-            type: .home,
-            line1: "89 Furnace Dr.",
-            line2: nil,
-            line3: nil,
-            suburb: "Invisible Winds",
-            city: "Nowhere",
-            state: String(repeating: "l", count: 41),
-            country: "US",
-            postalCode: "66167"
-        ))
-        try XCTAssertThrowsError(BusinessOwner.Address(
-            type: .home,
-            line1: "89 Furnace Dr.",
-            line2: nil,
-            line3: nil,
-            suburb: "Invisible Winds",
-            city: "Nowhere",
-            state: "KS",
-            country: "usa",
+            state: .ks,
+            country: .unitedStates,
             postalCode: "66167"
         ))
     }
@@ -115,8 +93,8 @@ final class BusinessOwnerAddressTests: XCTestCase {
             line3: nil,
             suburb: "Invisible Winds",
             city: "Nowhere",
-            state: "KS",
-            country: "US",
+            state: .ks,
+            country: .unitedStates,
             postalCode: "66167"
         )
         let generated = try String(data: encoder.encode(address), encoding: .utf8)!
@@ -144,8 +122,8 @@ final class BusinessOwnerAddressTests: XCTestCase {
             line3: nil,
             suburb: "Invisible Winds",
             city: "Nowhere",
-            state: "KS",
-            country: "US",
+            state: .ks,
+            country: .unitedStates,
             postalCode: "66167"
         )
         let json = """
@@ -214,14 +192,6 @@ final class BusinessOwnerAddressTests: XCTestCase {
             "country_code": "US"
         }
         """.data(using: .utf8)!
-        let country = """
-        {
-            "type": "HOME",
-            "line1": "89 Furnace Dr.",
-            "city": "Nowhere",
-            "country_code": "usa"
-        }
-        """.data(using: .utf8)!
         
         try XCTAssertEqual(address, decoder.decode(BusinessOwner.Address.self, from: json))
         try XCTAssertThrowsError(decoder.decode(BusinessOwner.Address.self, from: line1))
@@ -230,7 +200,6 @@ final class BusinessOwnerAddressTests: XCTestCase {
         try XCTAssertThrowsError(decoder.decode(BusinessOwner.Address.self, from: suburb))
         try XCTAssertThrowsError(decoder.decode(BusinessOwner.Address.self, from: city))
         try XCTAssertThrowsError(decoder.decode(BusinessOwner.Address.self, from: state))
-        try XCTAssertThrowsError(decoder.decode(BusinessOwner.Address.self, from: country))
     }
     
     static var allTests: [(String, (BusinessOwnerAddressTests) -> ()throws -> ())] = [
diff --git a/Tests/PayPalTests/ModelTests/BusinessOwnerTests.swift b/Tests/PayPalTests/ModelTests/BusinessOwnerTests.swift
index 13b16151..8ac42809 100644
--- a/Tests/PayPalTests/ModelTests/BusinessOwnerTests.swift
+++ b/Tests/PayPalTests/ModelTests/BusinessOwnerTests.swift
@@ -7,7 +7,7 @@ final class BusinessOwnerTests: XCTestCase {
             email: "business@example.com",
             name: Name(prefix: "Sir", given: "Walter", surname: "Scott", middle: nil, suffix: "Bart.", full: "Sir Walter Scott"),
             relationships: [],
-            country: "UK",
+            country: .unitedKingdom,
             addresses: [],
             birthdate: "1771-08-15",
             language: .en_GB,
@@ -18,7 +18,7 @@ final class BusinessOwnerTests: XCTestCase {
         
         XCTAssertEqual(owner.email, "business@example.com")
         XCTAssertEqual(owner.relationships, [])
-        XCTAssertEqual(owner.country, "UK")
+        XCTAssertEqual(owner.country, .unitedKingdom)
         XCTAssertEqual(owner.addresses, [])
         XCTAssertEqual(owner.birthdate, "1771-08-15")
         XCTAssertEqual(owner.language, .en_GB)
@@ -33,7 +33,7 @@ final class BusinessOwnerTests: XCTestCase {
             email: "business@",
             name: Name(prefix: "Sir", given: "Walter", surname: "Scott", middle: nil, suffix: "Bart.", full: "Sir Walter Scott"),
             relationships: [],
-            country: "UK",
+            country: .unitedKingdom,
             addresses: [],
             birthdate: "1771-08-15",
             language: .en_GB,
@@ -45,19 +45,7 @@ final class BusinessOwnerTests: XCTestCase {
             email: "business@example.com",
             name: Name(prefix: "Sir", given: "Walter", surname: "Scott", middle: nil, suffix: "Bart.", full: "Sir Walter Scott"),
             relationships: [],
-            country: "usa",
-            addresses: [],
-            birthdate: "1771-08-15",
-            language: .en_GB,
-            phones: [],
-            ids: [],
-            occupation: "Author"
-        ))
-        try XCTAssertThrowsError(BusinessOwner(
-            email: "business@example.com",
-            name: Name(prefix: "Sir", given: "Walter", surname: "Scott", middle: nil, suffix: "Bart.", full: "Sir Walter Scott"),
-            relationships: [],
-            country: "UK",
+            country: .unitedKingdom,
             addresses: [],
             birthdate: "08/15/1771",
             language: .en_GB,
@@ -69,7 +57,7 @@ final class BusinessOwnerTests: XCTestCase {
             email: "business@example.com",
             name: Name(prefix: "Sir", given: "Walter", surname: "Scott", middle: nil, suffix: "Bart.", full: "Sir Walter Scott"),
             relationships: [],
-            country: "UK",
+            country: .unitedKingdom,
             addresses: [],
             birthdate: "1771-08-15",
             language: .en_GB,
@@ -79,14 +67,11 @@ final class BusinessOwnerTests: XCTestCase {
         )
         
         try XCTAssertThrowsError(owner.set(\.email <~ "scottinklings.swift"))
-        try XCTAssertThrowsError(owner.set(\.country <~ "usa"))
         try XCTAssertThrowsError(owner.set(\.birthdate <~ "05/06/1969"))
         try owner.set(\.email <~ "scott@inklings.swift")
-        try owner.set(\.country <~ "US")
         try owner.set(\.birthdate <~ "1969-06-05")
         
         XCTAssertEqual(owner.email, "scott@inklings.swift")
-        XCTAssertEqual(owner.country, "US")
         XCTAssertEqual(owner.birthdate, "1969-06-05")
     }
     
@@ -96,7 +81,7 @@ final class BusinessOwnerTests: XCTestCase {
             email: "business@example.com",
             name: Name(prefix: "Sir", given: "Walter", surname: "Scott", middle: nil, suffix: "Bart.", full: "Sir Walter Scott"),
             relationships: [],
-            country: "UK",
+            country: .unitedKingdom,
             addresses: [],
             birthdate: "1771-08-15",
             language: .en_GB,
@@ -106,9 +91,10 @@ final class BusinessOwnerTests: XCTestCase {
         )
         let generated = try String(data: encoder.encode(owner), encoding: .utf8)!
         let json =
-            "{\"phones\":[],\"account_owner_relationships\":[],\"country_code_of_nationality\":\"UK\",\"date_of_birth\":\"1771-08-15\",\"addresses\":[]," +
-            "\"email\":\"business@example.com\",\"occupation\":\"Author\",\"identifications\":[],\"name\":{\"given_name\":\"Walter\"," +
-            "\"full_name\":\"Sir Walter Scott\",\"prefix\":\"Sir\",\"surname\":\"Scott\",\"suffix\":\"Bart.\"},\"language_code\":\"en_GB\"}"
+            "{\"phones\":[],\"account_owner_relationships\":[],\"country_code_of_nationality\":\"GB\",\"date_of_birth\":\"1771-08-15\"," +
+            "\"addresses\":[],\"email\":\"business@example.com\",\"occupation\":\"Author\",\"identifications\":[]," +
+            "\"name\":{\"given_name\":\"Walter\",\"full_name\":\"Sir Walter Scott\",\"prefix\":\"Sir\",\"surname\":\"Scott\"," +
+            "\"suffix\":\"Bart.\"},\"language_code\":\"en_GB\"}"
         
         var index = 0
         for (jsonChar, genChar) in zip(json, generated) {
@@ -127,7 +113,7 @@ final class BusinessOwnerTests: XCTestCase {
             email: "business@example.com",
             name: Name(prefix: "Sir", given: "Walter", surname: "Scott", middle: nil, suffix: "Bart.", full: "Sir Walter Scott"),
             relationships: [],
-            country: "UK",
+            country: .unitedKingdom,
             addresses: [],
             birthdate: "1771-08-15",
             language: .en_GB,
@@ -143,7 +129,7 @@ final class BusinessOwnerTests: XCTestCase {
             "language_code": "en_GB",
             "date_of_birth": "1771-08-15",
             "addresses": [],
-            "country_code_of_nationality": "UK",
+            "country_code_of_nationality": "GB",
             "account_owner_relationships": [],
             "name": {
                 "full_name": "Sir Walter Scott",
diff --git a/Tests/PayPalTests/ModelTests/BusinessTests.swift b/Tests/PayPalTests/ModelTests/BusinessTests.swift
index 45d3a548..761610e5 100644
--- a/Tests/PayPalTests/ModelTests/BusinessTests.swift
+++ b/Tests/PayPalTests/ModelTests/BusinessTests.swift
@@ -7,7 +7,7 @@ final class BusinessTests: XCTestCase {
             type: .individual,
             subType: .unselected,
             government: GovernmentBody(name: ""),
-            establishment: Establishment(state: "KS", country: "US"),
+            establishment: Establishment(state: .ks, country: .unitedStates),
             names: [],
             ids: [],
             phones: [],
@@ -18,8 +18,8 @@ final class BusinessTests: XCTestCase {
             registrationDate: TimelessDate(date: "1975-04-22"),
             disputeEmail: EmailAddress(email: "disputable@exmaple.com"),
             sales: .init(
-                price: MoneyRange("50"..."60", currency: .usd),
-                volume: MoneyRange("50"..."60", currency: .usd),
+                price: MoneyRange(50...60, currency: .usd),
+                volume: MoneyRange(50...60, currency: .usd),
                 venues: [],
                 website: "https://nameless.io",
                 online: PercentRange(0...1)
@@ -30,7 +30,7 @@ final class BusinessTests: XCTestCase {
                 message: []
             ),
             addresses: [],
-            country: "US",
+            country: .unitedStates,
             stakeholders: [],
             designation: .init(title: "CTO", area: "Software Engineering")
         )
@@ -45,17 +45,17 @@ final class BusinessTests: XCTestCase {
         XCTAssertEqual(business.subCategory, "5972")
         XCTAssertEqual(business.merchantCategory, "4653")
         XCTAssertEqual(business.addresses, [])
-        XCTAssertEqual(business.country, "US")
+        XCTAssertEqual(business.country, .unitedStates)
         XCTAssertEqual(business.stakeholders, [])
         XCTAssertEqual(business.designation, Business.Designation(title: "CTO", area: "Software Engineering"))
         
-        try XCTAssertEqual(business.establishment, Establishment(state: "KS", country: "US"))
-        try XCTAssertEqual(business.establishedDate, TimelessDate(date: "1882-05-13"))
-        try XCTAssertEqual(business.registrationDate, TimelessDate(date: "1975-04-22"))
+        XCTAssertEqual(business.establishment, Establishment(state: .ks, country: .unitedStates))
+        XCTAssertEqual(business.establishedDate, TimelessDate(date: "1882-05-13"))
+        XCTAssertEqual(business.registrationDate, TimelessDate(date: "1975-04-22"))
         try XCTAssertEqual(business.disputeEmail, EmailAddress(email: "disputable@exmaple.com"))
         try XCTAssertEqual(business.sales, Business.Sales.init(
-            price: MoneyRange("50"..."60", currency: .usd),
-            volume: MoneyRange("50"..."60", currency: .usd),
+            price: MoneyRange(50...60, currency: .usd),
+            volume: MoneyRange(50...60, currency: .usd),
             venues: [],
             website: "https://nameless.io",
             online: PercentRange(0...1)
@@ -176,7 +176,7 @@ final class BusinessTests: XCTestCase {
             merchantCategory: "4653",
             establishedDate: TimelessDate(date: nil),
             registrationDate: TimelessDate(date: nil),
-            disputeEmail: EmailAddress(email: nil),
+            disputeEmail: nil,
             sales: .init(
                 price: nil,
                 volume: nil,
@@ -185,12 +185,12 @@ final class BusinessTests: XCTestCase {
                 online: nil
             ),
             customerService: CustomerService(
-                email: EmailAddress(email: nil),
+                email: EmailAddress(email: "help@nameless.com"),
                 phone: nil,
                 message: nil
             ),
             addresses: [],
-            country: "US",
+            country: .unitedStates,
             stakeholders: [],
             designation: .init(title: nil, area: nil)
         )
@@ -199,8 +199,9 @@ final class BusinessTests: XCTestCase {
         let json =
             "{\"date_of_registration\":{},\"category\":\"3145\",\"sub_type\":\"UNSELECTED\",\"addresses\":[],\"sub_category\":\"5972\",\"names\":[]," +
             "\"business_sales_details\":{},\"phones\":[],\"government_body\":{},\"type\":\"INDIVIDUAL\",\"identifications\":[]," +
-            "\"date_business_established\":{},\"country_code_of_incorporation\":\"US\",\"stakeholders\":[],\"dispute_email\":{}," +
-            "\"customer_service\":{\"email\":{}},\"designation\":{},\"merchant_category_code\":\"4653\",\"place_of_establishment\":{}}"
+            "\"date_business_established\":{},\"country_code_of_incorporation\":\"US\",\"stakeholders\":[]," +
+            "\"customer_service\":{\"email\":\"help@nameless.com\"},\"designation\":{},\"merchant_category_code\":\"4653\"," +
+            "\"place_of_establishment\":{}}"
         
         var index = 0
         for (jsonChar, genChar) in zip(json, generated) {
@@ -228,10 +229,10 @@ final class BusinessTests: XCTestCase {
             "merchant_category_code": "4653",
             "date_business_established": {},
             "date_of_registration": {},
-            "dispute_email": {},
+            "dispute_email": null,
             "business_sales_details": {},
             "customer_service": {
-                "email": {}
+                "email": "help@nameless.com"
             },
             "addresses": [],
             "country_code_of_incorporation": "US",
@@ -254,7 +255,7 @@ final class BusinessTests: XCTestCase {
                 merchantCategory: "4653",
                 establishedDate: TimelessDate(date: nil),
                 registrationDate: TimelessDate(date: nil),
-                disputeEmail: EmailAddress(email: nil),
+                disputeEmail: nil,
                 sales: .init(
                     price: nil,
                     volume: nil,
@@ -263,12 +264,12 @@ final class BusinessTests: XCTestCase {
                     online: nil
                 ),
                 customerService: CustomerService(
-                    email: EmailAddress(email: nil),
+                    email: EmailAddress(email: "help@nameless.com"),
                     phone: nil,
                     message: nil
                 ),
                 addresses: [],
-                country: "US",
+                country: .unitedStates,
                 stakeholders: [],
                 designation: .init(title: nil, area: nil)
             ),
diff --git a/Tests/PayPalTests/ModelTests/CaptureTests.swift b/Tests/PayPalTests/ModelTests/CaptureTests.swift
index ffe69879..bdab8a24 100644
--- a/Tests/PayPalTests/ModelTests/CaptureTests.swift
+++ b/Tests/PayPalTests/ModelTests/CaptureTests.swift
@@ -3,24 +3,24 @@ import XCTest
 
 final class CaptureTests: XCTestCase {
     func testInit()throws {
-        let capture = try Capture(
-            amount: DetailedAmount(currency: .usd, total: "10.00", details: nil),
-            transaction: Amount(currency: .usd, value: "1.00")
+        let capture = Capture(
+            amount: DetailedAmount(currency: .usd, total: 10.00, details: nil),
+            transaction: CurrencyAmount(currency: .usd, value: 1.00)
         )
         
         XCTAssertNil(capture.id)
         XCTAssertNil(capture.links)
         XCTAssertNil(capture.status)
         XCTAssertNil(capture.reason)
-        try XCTAssertEqual(capture.amount, DetailedAmount(currency: .usd, total: "10.00", details: nil))
-        try XCTAssertEqual(capture.transaction, Amount(currency: .usd, value: "1.00"))
+        XCTAssertEqual(capture.transaction, CurrencyAmount(currency: .usd, value: 1.00))
+        XCTAssertEqual(capture.amount, DetailedAmount(currency: .usd, total: 10.00, details: nil))
     }
     
     func testEncoding()throws {
         let encoder = JSONEncoder()
-        let capture = try Capture(
-            amount: DetailedAmount(currency: .usd, total: "10.00", details: nil),
-            transaction: Amount(currency: .usd, value: "1.00")
+        let capture = Capture(
+            amount: DetailedAmount(currency: .usd, total: 10.00, details: nil),
+            transaction: CurrencyAmount(currency: .usd, value: 1.00)
         )
         let generated = try String(data: encoder.encode(capture), encoding: .utf8)
         let json = "{\"amount\":{\"currency\":\"USD\",\"total\":\"10.00\"},\"transaction_fee\":{\"value\":\"1.00\",\"currency\":\"USD\"}}"
@@ -53,8 +53,8 @@ final class CaptureTests: XCTestCase {
         XCTAssertEqual(capture.links, [])
         XCTAssertEqual(capture.status, .pending)
         XCTAssertEqual(capture.reason, .buyerComplaint)
-        try XCTAssertEqual(capture.amount, DetailedAmount(currency: .usd, total: "10.00", details: nil))
-        try XCTAssertEqual(capture.transaction, Amount(currency: .usd, value: "1.00"))
+        XCTAssertEqual(capture.amount, DetailedAmount(currency: .usd, total: 10.00, details: nil))
+        XCTAssertEqual(capture.transaction, CurrencyAmount(currency: .usd, value: 1.00))
     }
     
     static var allTests: [(String, (CaptureTests) -> ()throws -> ())] = [
diff --git a/Tests/PayPalTests/ModelTests/ChargeTests.swift b/Tests/PayPalTests/ModelTests/ChargeTests.swift
index 99afa0dc..8fd6d06d 100644
--- a/Tests/PayPalTests/ModelTests/ChargeTests.swift
+++ b/Tests/PayPalTests/ModelTests/ChargeTests.swift
@@ -3,16 +3,16 @@ import XCTest
 
 final class ChargeTests: XCTestCase {
     func testInit()throws {
-        let charge = try Charge(type: .shipping, amount: Money(currency: .usd, value: "314.15"))
+        let charge = Charge(type: .shipping, amount: CurrencyCodeAmount(currency: .usd, value: 314.15))
         
         XCTAssertEqual(charge.id, nil)
         XCTAssertEqual(charge.type, .shipping)
-        try XCTAssertEqual(charge.amount, Money(currency: .usd, value: "314.15"))
+        XCTAssertEqual(charge.amount, CurrencyCodeAmount(currency: .usd, value: 314.15))
     }
     
     func testEncoding()throws {
         let encoder = JSONEncoder()
-        let generated = try String(data: encoder.encode(Charge(type: .shipping, amount: Money(currency: .eur, value: "314.15"))), encoding: .utf8)
+        let generated = try String(data: encoder.encode(Charge(type: .shipping, amount: CurrencyCodeAmount(currency: .eur, value: 314.15))), encoding: .utf8)
         
         XCTAssertEqual(generated, "{\"type\":\"SHIPPING\",\"amount\":{\"value\":\"314.15\",\"currency_code\":\"EUR\"}}")
     }
@@ -30,7 +30,7 @@ final class ChargeTests: XCTestCase {
         }
         """.data(using: .utf8)!
 
-        try XCTAssertEqual(Charge(type: .tax, amount: Money(currency: .eur, value: "13.54")), decoder.decode(Charge.self, from: json))
+        try XCTAssertEqual(Charge(type: .tax, amount: CurrencyCodeAmount(currency: .eur, value: 13.54)), decoder.decode(Charge.self, from: json))
     }
     
     static var allTests: [(String, (ChargeTests) -> ()throws -> ())] = [
diff --git a/Tests/PayPalTests/ModelTests/CreditCardStateTests.swift b/Tests/PayPalTests/ModelTests/CreditCardStateTests.swift
index 4f26ad8f..47087e7b 100644
--- a/Tests/PayPalTests/ModelTests/CreditCardStateTests.swift
+++ b/Tests/PayPalTests/ModelTests/CreditCardStateTests.swift
@@ -1,19 +1,21 @@
 import XCTest
 @testable import PayPal
 
+fileprivate typealias CCStaate = CreditCard.State
+
 final class CreditCardStateTests: XCTestCase {
-    struct CC: Codable {
-        let state: CreditCardState
+    private struct CC: Codable {
+        let state: CCStaate
     }
     
     func testCaseRawValues() {
-        XCTAssertEqual(CreditCardState.ok.rawValue, "ok")
-        XCTAssertEqual(CreditCardState.expired.rawValue, "expired")
+        XCTAssertEqual(CCStaate.ok.rawValue, "ok")
+        XCTAssertEqual(CCStaate.expired.rawValue, "expired")
     }
     
     func testAllCase() {
-        XCTAssertEqual(CreditCardState.allCases.count, 2)
-        XCTAssertEqual(CreditCardState.allCases, [.ok, .expired])
+        XCTAssertEqual(CCStaate.allCases.count, 2)
+        XCTAssertEqual(CCStaate.allCases, [.ok, .expired])
     }
     
     func testEncoding()throws {
diff --git a/Tests/PayPalTests/ModelTests/CustomerDisputeListTests.swift b/Tests/PayPalTests/ModelTests/CustomerDisputeListTests.swift
index 37081257..88c754a0 100644
--- a/Tests/PayPalTests/ModelTests/CustomerDisputeListTests.swift
+++ b/Tests/PayPalTests/ModelTests/CustomerDisputeListTests.swift
@@ -11,7 +11,7 @@ final class CustomerDisputeListTests: XCTestCase {
                         sellerID: "3DE7148F-360E-4F22-9DE2-8507E24DB60B",
                         created: Date().iso8601,
                         status: .pending,
-                        gross: Money(currency: .usd, value: "89.45"),
+                        gross: CurrencyCodeAmount(currency: .usd, value: 89.45),
                         invoice: "C80ED435-DBB2-456B-A1EF-2750A32AAF1A",
                         custom: nil,
                         buyer: Buyer(email: "witheringheights@exmaple.com", name: "Leeli Wingfeather"),
@@ -19,7 +19,7 @@ final class CustomerDisputeListTests: XCTestCase {
                     )
                 ],
                 reason: .unauthorized,
-                amount: Money(currency: .usd, value: "89.45"),
+                amount: CurrencyCodeAmount(currency: .usd, value: 89.45),
                 messages: nil,
                 responseDue: Date(timeIntervalSinceNow: 60 * 60 * 24).iso8601
             )
@@ -34,7 +34,7 @@ final class CustomerDisputeListTests: XCTestCase {
                     sellerID: "3DE7148F-360E-4F22-9DE2-8507E24DB60B",
                     created: Date().iso8601,
                     status: .pending,
-                    gross: Money(currency: .usd, value: "89.45"),
+                    gross: CurrencyCodeAmount(currency: .usd, value: 89.45),
                     invoice: "C80ED435-DBB2-456B-A1EF-2750A32AAF1A",
                     custom: nil,
                     buyer: Buyer(email: "witheringheights@exmaple.com", name: "Leeli Wingfeather"),
@@ -42,7 +42,7 @@ final class CustomerDisputeListTests: XCTestCase {
                 )
             ],
             reason: .unauthorized,
-            amount: Money(currency: .usd, value: "89.45"),
+            amount: CurrencyCodeAmount(currency: .usd, value: 89.45),
             messages: nil,
             responseDue: Date(timeIntervalSinceNow: 60 * 60 * 24).iso8601
         ))
@@ -55,7 +55,7 @@ final class CustomerDisputeListTests: XCTestCase {
             CustomerDispute(
                 transactions: [],
                 reason: .unauthorized,
-                amount: Money(currency: .usd, value: "89.45"),
+                amount: CurrencyCodeAmount(currency: .usd, value: 89.45),
                 messages: nil,
                 responseDue: due
             )
@@ -93,7 +93,7 @@ final class CustomerDisputeListTests: XCTestCase {
                 CustomerDispute(
                     transactions: [],
                     reason: .unauthorized,
-                    amount: Money(currency: .usd, value: "89.45"),
+                    amount: CurrencyCodeAmount(currency: .usd, value: 89.45),
                     messages: nil,
                     responseDue: Date(timeIntervalSinceNow: 60 * 60 * 24).iso8601
                 )
diff --git a/Tests/PayPalTests/ModelTests/CustomerDisputeTests.swift b/Tests/PayPalTests/ModelTests/CustomerDisputeTests.swift
index 788eeed3..af754009 100644
--- a/Tests/PayPalTests/ModelTests/CustomerDisputeTests.swift
+++ b/Tests/PayPalTests/ModelTests/CustomerDisputeTests.swift
@@ -12,7 +12,7 @@ final class CustomerDisputeTests: XCTestCase {
                     sellerID: "3DE7148F-360E-4F22-9DE2-8507E24DB60B",
                     created: Date().iso8601,
                     status: .pending,
-                    gross: Money(currency: .usd, value: "89.45"),
+                    gross: CurrencyCodeAmount(currency: .usd, value: 89.45),
                     invoice: "C80ED435-DBB2-456B-A1EF-2750A32AAF1A",
                     custom: nil,
                     buyer: Buyer(email: "witheringheights@exmaple.com", name: "Leeli Wingfeather"),
@@ -20,7 +20,7 @@ final class CustomerDisputeTests: XCTestCase {
                 )
             ],
             reason: .unauthorized,
-            amount: Money(currency: .usd, value: "89.45"),
+            amount: CurrencyCodeAmount(currency: .usd, value: 89.45),
             messages: nil,
             responseDue: self.due
         )
@@ -44,27 +44,27 @@ final class CustomerDisputeTests: XCTestCase {
             sellerID: "3DE7148F-360E-4F22-9DE2-8507E24DB60B",
             created: Date().iso8601,
             status: .pending,
-            gross: Money(currency: .usd, value: "89.45"),
+            gross: CurrencyCodeAmount(currency: .usd, value: 89.45),
             invoice: "C80ED435-DBB2-456B-A1EF-2750A32AAF1A",
             custom: nil,
             buyer: Buyer(email: "witheringheights@exmaple.com", name: "Leeli Wingfeather"),
             seller: Seller(email: "throg@exmaple.com", name: "Nag the Nameless", merchantID: nil)
         ))
-        try XCTAssertEqual(dispute.amount, Money(currency: .usd, value: "89.45"))
+        XCTAssertEqual(dispute.amount, CurrencyCodeAmount(currency: .usd, value: 89.45))
     }
     
     func testValidations()throws {
         try XCTAssertThrowsError(CustomerDispute(
             transactions: [],
             reason: .unauthorized,
-            amount: Money(currency: .usd, value: "89.45"),
+            amount: CurrencyCodeAmount(currency: .usd, value: 89.45),
             messages: nil,
             responseDue: "0000-09-10T23:56:60.999999999999999999999999999999999999999-22:88"
         ))
         try XCTAssertThrowsError(CustomerDispute(
             transactions: [],
             reason: .unauthorized,
-            amount: Money(currency: .usd, value: "89.45"),
+            amount: CurrencyCodeAmount(currency: .usd, value: 89.45),
             messages: nil,
             responseDue: "1/2/13 1:24:54pm"
         ))
@@ -72,7 +72,7 @@ final class CustomerDisputeTests: XCTestCase {
         var dispute = try CustomerDispute(
             transactions: [],
             reason: .unauthorized,
-            amount: Money(currency: .usd, value: "89.45"),
+            amount: CurrencyCodeAmount(currency: .usd, value: 89.45),
             messages: nil,
             responseDue: self.due
         )
@@ -89,7 +89,7 @@ final class CustomerDisputeTests: XCTestCase {
         let dispute = try CustomerDispute(
             transactions: [],
             reason: .unauthorized,
-            amount: Money(currency: .usd, value: "89.45"),
+            amount: CurrencyCodeAmount(currency: .usd, value: 89.45),
             messages: nil,
             responseDue: self.due
         )
@@ -154,7 +154,7 @@ final class CustomerDisputeTests: XCTestCase {
         try XCTAssertEqual(decoder.decode(CustomerDispute.self, from: min), CustomerDispute(
             transactions: [],
             reason: .unauthorized,
-            amount: Money(currency: .usd, value: "89.45"),
+            amount: CurrencyCodeAmount(currency: .usd, value: 89.45),
             messages: nil,
             responseDue: self.due
         ))
diff --git a/Tests/PayPalTests/ModelTests/DetailTests.swift b/Tests/PayPalTests/ModelTests/DetailTests.swift
index 6c4cc394..1d777923 100644
--- a/Tests/PayPalTests/ModelTests/DetailTests.swift
+++ b/Tests/PayPalTests/ModelTests/DetailTests.swift
@@ -8,13 +8,13 @@ final class DetailTests: XCTestCase {
     let oneYear = (Date() + (60 * 60 * 24 * 365)).iso8601
     
     func testInit()throws {
-        let details = try Details(
-            outstanding: Money(currency: .usd, value: "599.00"),
+        let details = Details(
+            outstanding: CurrencyCodeAmount(currency: .usd, value: 599.00),
             cyclesRemaining: "30",
             cyclesComplete: "45",
             nextBilling: oneYear,
             lastPaymentDate: now,
-            lastPaymentAmount: Money(currency: .usd, value: "19.97"),
+            lastPaymentAmount: CurrencyCodeAmount(currency: .usd, value: 19.97),
             finalPaymentDate: later,
             failedPaymentCount: "5"
         )
@@ -26,21 +26,21 @@ final class DetailTests: XCTestCase {
         XCTAssertEqual(details.finalPaymentDate, later)
         XCTAssertEqual(details.failedPaymentCount, "5")
         
-        try XCTAssertEqual(details.lastPaymentAmount, Money(currency: .usd, value: "19.97"))
-        try XCTAssertEqual(details.outstanding, Money(currency: .usd, value: "599.00"))
+        XCTAssertEqual(details.lastPaymentAmount, CurrencyCodeAmount(currency: .usd, value: 19.97))
+        XCTAssertEqual(details.outstanding, CurrencyCodeAmount(currency: .usd, value: 599.00))
     }
     
     func testEncoding()throws {
         let encoder = JSONEncoder()
         encoder.dateEncodingStrategy = .iso8601
         
-        let details = try Details(
-            outstanding: Money(currency: .usd, value: "599.00"),
+        let details = Details(
+            outstanding: CurrencyCodeAmount(currency: .usd, value: 599.00),
             cyclesRemaining: "30",
             cyclesComplete: "45",
             nextBilling: oneYear,
             lastPaymentDate: now,
-            lastPaymentAmount: Money(currency: .usd, value: "19.97"),
+            lastPaymentAmount: CurrencyCodeAmount(currency: .usd, value: 19.97),
             finalPaymentDate: later,
             failedPaymentCount: "5"
         )
@@ -84,13 +84,13 @@ final class DetailTests: XCTestCase {
         """.data(using: .utf8)!
         
         let decoded = try decoder.decode(Details.self, from: json)
-        let details = try Details(
-            outstanding: Money(currency: .usd, value: "599.00"),
+        let details = Details(
+            outstanding: CurrencyCodeAmount(currency: .usd, value: 599.00),
             cyclesRemaining: "30",
             cyclesComplete: "45",
             nextBilling: oneYear,
             lastPaymentDate: now,
-            lastPaymentAmount: Money(currency: .usd, value: "19.97"),
+            lastPaymentAmount: CurrencyCodeAmount(currency: .usd, value: 19.97),
             finalPaymentDate: later,
             failedPaymentCount: "5"
         )
diff --git a/Tests/PayPalTests/ModelTests/DetailedAmountDetailTests.swift b/Tests/PayPalTests/ModelTests/DetailedAmountDetailTests.swift
index afb5b9b2..b46896e6 100644
--- a/Tests/PayPalTests/ModelTests/DetailedAmountDetailTests.swift
+++ b/Tests/PayPalTests/ModelTests/DetailedAmountDetailTests.swift
@@ -3,82 +3,40 @@ import XCTest
 
 final class DetailedAmountDetailTests: XCTestCase {
     func testInit()throws {
-        let details = try DetailedAmount.Detail(
-            subtotal: "134.56",
-            shipping: "5.69",
-            tax: "13.45",
-            handlingFee: "1.00",
-            shippingDiscount: "5.69",
-            insurance: "10.00",
-            giftWrap: "2.50"
+        let details = DetailedAmount.Detail(
+            subtotal: 134.56,
+            shipping: 5.69,
+            tax: 13.45,
+            handlingFee: 1.00,
+            shippingDiscount: 5.69,
+            insurance: 10.00,
+            giftWrap: 2.50
         )
         
-        XCTAssertEqual(details.subtotal, "134.56")
-        XCTAssertEqual(details.shipping, "5.69")
-        XCTAssertEqual(details.tax, "13.45")
-        XCTAssertEqual(details.handlingFee, "1.00")
-        XCTAssertEqual(details.shippingDiscount, "5.69")
-        XCTAssertEqual(details.insurance, "10.00")
-        XCTAssertEqual(details.giftWrap, "2.50")
-    }
-    
-    func testValidations()throws {
-        try XCTAssertThrowsError(DetailedAmount.Detail(subtotal: "134.568"))
-        try XCTAssertThrowsError(DetailedAmount.Detail(subtotal: "134.56", shipping: "12345678.00"))
-        try XCTAssertThrowsError(DetailedAmount.Detail(subtotal: "134.56", tax: "1,000.99"))
-        try XCTAssertThrowsError(DetailedAmount.Detail(subtotal: "134.56", handlingFee: "99.987"))
-        try XCTAssertThrowsError(DetailedAmount.Detail(subtotal: "134.56", shippingDiscount: "90..56"))
-        try XCTAssertThrowsError(DetailedAmount.Detail(subtotal: "134.56", insurance: "$90.56"))
-        try XCTAssertThrowsError(DetailedAmount.Detail(subtotal: "134.56", giftWrap: "9876543.210"))
-        var details = try DetailedAmount.Detail(
-            subtotal: "134.56",
-            shipping: "5.69",
-            tax: "13.45",
-            handlingFee: "1.00",
-            shippingDiscount: "5.69",
-            insurance: "10.00",
-            giftWrap: "2.50"
-        )
-        
-        try XCTAssertThrowsError(details.set(\.subtotal <~ "134.568"))
-        try XCTAssertThrowsError(details.set(\.shipping <~ "12345678.00"))
-        try XCTAssertThrowsError(details.set(\.tax <~ "1,000.99"))
-        try XCTAssertThrowsError(details.set(\.handlingFee <~ "99.987"))
-        try XCTAssertThrowsError(details.set(\.shippingDiscount <~ "90..56"))
-        try XCTAssertThrowsError(details.set(\.insurance <~ "$90.56"))
-        try XCTAssertThrowsError(details.set(\.giftWrap <~ "9876543.210"))
-        try details.set(\.subtotal <~ "134.56")
-        try details.set(\.shipping <~ "1234567.00")
-        try details.set(\.tax <~ "1000.99")
-        try details.set(\.handlingFee <~ "99.98")
-        try details.set(\.shippingDiscount <~ "90.56")
-        try details.set(\.insurance <~ "90.56")
-        try details.set(\.giftWrap <~ "9876543.21")
-        
-        XCTAssertEqual(details.subtotal, "134.56")
-        XCTAssertEqual(details.shipping, "1234567.00")
-        XCTAssertEqual(details.tax, "1000.99")
-        XCTAssertEqual(details.handlingFee, "99.98")
-        XCTAssertEqual(details.shippingDiscount, "90.56")
-        XCTAssertEqual(details.insurance, "90.56")
-        XCTAssertEqual(details.giftWrap, "9876543.21")
+        XCTAssertEqual(details.subtotal, 134.56)
+        XCTAssertEqual(details.shipping, 5.69)
+        XCTAssertEqual(details.tax, 13.45)
+        XCTAssertEqual(details.handlingFee, 1.00)
+        XCTAssertEqual(details.shippingDiscount, 5.69)
+        XCTAssertEqual(details.insurance, 10.00)
+        XCTAssertEqual(details.giftWrap, 2.50)
     }
     
     func testEncoding()throws {
         let encoder = JSONEncoder()
-        let details = try DetailedAmount.Detail(
-            subtotal: "134.56",
-            shipping: "5.69",
-            tax: "13.45",
-            handlingFee: "1.00",
-            shippingDiscount: "5.69",
-            insurance: "10.00",
-            giftWrap: "2.50"
+        let details = DetailedAmount.Detail(
+            subtotal: 134.567,
+            shipping: 5.69,
+            tax: 13.45,
+            handlingFee: 1.003,
+            shippingDiscount: 5.69,
+            insurance: 10.006,
+            giftWrap: 2.50
         )
         let generated = try String(data: encoder.encode(details), encoding: .utf8)!
         let json =
-            "{\"handling_fee\":\"1.00\",\"subtotal\":\"134.56\",\"shipping_discount\":\"5.69\",\"insurance\":\"10.00\",\"tax\":\"13.45\"," +
-            "\"gift_wrap\":\"2.50\",\"shipping\":\"5.69\"}"
+            "{\"handling_fee\":\"1\",\"subtotal\":\"134.57\",\"shipping_discount\":\"5.69\",\"insurance\":\"10.01\",\"tax\":\"13.45\"," +
+            "\"gift_wrap\":\"2.5\",\"shipping\":\"5.69\"}"
         
         XCTAssertEqual(generated, json)
     }
@@ -139,27 +97,33 @@ final class DetailedAmountDetailTests: XCTestCase {
         }
         """
         
-        try XCTAssertThrowsError(decoder.decode(DetailedAmount.Detail.self, from: subtotal))
         try XCTAssertThrowsError(decoder.decode(DetailedAmount.Detail.self, from: shipping))
         try XCTAssertThrowsError(decoder.decode(DetailedAmount.Detail.self, from: tax))
-        try XCTAssertThrowsError(decoder.decode(DetailedAmount.Detail.self, from: handlingFee))
         try XCTAssertThrowsError(decoder.decode(DetailedAmount.Detail.self, from: shippingDiscount))
         try XCTAssertThrowsError(decoder.decode(DetailedAmount.Detail.self, from: insurance))
-        try XCTAssertThrowsError(decoder.decode(DetailedAmount.Detail.self, from: giftWrap))
+        
+        try XCTAssertEqual(
+            decoder.decode(DetailedAmount.Detail.self, from: subtotal).subtotal,
+            Decimal(sign: .plus, exponent: -2, significand: 13457)
+        )
+        try XCTAssertEqual(
+            decoder.decode(DetailedAmount.Detail.self, from: giftWrap).giftWrap,
+            Decimal(_exponent: -12, _length: 4, _isNegative: 0, _isCompact: 1, _reserved: 0, _mantissa: (41984, 43224, 34744, 35088, 0, 0, 0, 0))
+        )
+        try XCTAssertEqual(decoder.decode(DetailedAmount.Detail.self, from: handlingFee).handlingFee, 99.99)
         try XCTAssertEqual(decoder.decode(DetailedAmount.Detail.self, from: json), DetailedAmount.Detail(
-            subtotal: "134.56",
-            shipping: "5.69",
-            tax: "13.45",
-            handlingFee: "1.00",
-            shippingDiscount: "5.69",
-            insurance: "10.00",
-            giftWrap: "2.50"
+            subtotal: 134.56,
+            shipping: 5.69,
+            tax: 13.45,
+            handlingFee: 1.00,
+            shippingDiscount: 5.69,
+            insurance: 10.00,
+            giftWrap: 2.50
         ))
     }
     
     static var allTests: [(String, (DetailedAmountDetailTests) -> ()throws -> ())] = [
         ("testInit", testInit),
-        ("testValidations", testValidations),
         ("testEncoding", testEncoding),
         ("testDecoding", testDecoding)
     ]
diff --git a/Tests/PayPalTests/ModelTests/DetailedAmountTests.swift b/Tests/PayPalTests/ModelTests/DetailedAmountTests.swift
index 01173f04..77224abe 100644
--- a/Tests/PayPalTests/ModelTests/DetailedAmountTests.swift
+++ b/Tests/PayPalTests/ModelTests/DetailedAmountTests.swift
@@ -3,38 +3,28 @@ import XCTest
 
 final class DetailedAmountTests: XCTestCase {
     func testInit()throws {
-        let details = try DetailedAmount.Detail(
-            subtotal: "134.56",
-            shipping: "5.69",
-            tax: "13.45",
-            handlingFee: "1.00",
-            shippingDiscount: "5.69",
-            insurance: "10.00",
-            giftWrap: "2.50"
+        let details = DetailedAmount.Detail(
+            subtotal: 134.56,
+            shipping: 5.69,
+            tax: 13.45,
+            handlingFee: 1.00,
+            shippingDiscount: 5.69,
+            insurance: 10.00,
+            giftWrap: 2.50
         )
-        let amount = try DetailedAmount(currency: .usd, total: "172.89", details: details)
+        let amount = DetailedAmount(currency: .usd, total: 172.89, details: details)
 
         
-        XCTAssertEqual(amount.currency, .usd)
-        XCTAssertEqual(amount.total, "172.89")
+        XCTAssertEqual(amount.amount.currency, .usd)
+        XCTAssertEqual(amount.amount.value, 172.89)
         XCTAssertEqual(amount.details, details)
     }
     
-    func testValidations()throws {
-        try XCTAssertThrowsError(DetailedAmount(currency: .usd, total: "12345678.1", details: nil))
-        var amount = try DetailedAmount(currency: .usd, total: "172.89", details: nil)
-        
-        try XCTAssertThrowsError(amount.set(\.total <~ "12345678.1"))
-        try amount.set(\.total <~ "1234567.10")
-        
-        XCTAssertEqual(amount.total, "1234567.10")
-    }
-    
     func testEncoding()throws {
         let encoder = JSONEncoder()
-        let amount = try DetailedAmount(currency: .usd, total: "172.89", details: .init(subtotal: "134.56"))
+        let amount = DetailedAmount(currency: .usd, total: 172.89, details: .init(subtotal: 134.56))
         let generated = try String(data: encoder.encode(amount), encoding: .utf8)
-        let json = "{\"currency\":\"USD\",\"total\":\"172.89\",\"details\":{\"subtotal\":\"134.56\"}}"
+        let json = "{\"total\":\"172.89\",\"currency\":\"USD\",\"details\":{\"subtotal\":\"134.56\"}}"
         
         XCTAssertEqual(generated, json)
     }
@@ -51,13 +41,12 @@ final class DetailedAmountTests: XCTestCase {
         }
         """.data(using: .utf8)!
         
-        let amount = try DetailedAmount(currency: .usd, total: "172.89", details: .init(subtotal: "134.56"))
+        let amount = DetailedAmount(currency: .usd, total: 172.89, details: .init(subtotal: 134.56))
         try XCTAssertEqual(decoder.decode(DetailedAmount.self, from: json), amount)
     }
     
     static var allTests: [(String, (DetailedAmountTests) -> ()throws -> ())] = [
         ("testInit", testInit),
-        ("testValidations", testValidations),
         ("testEncoding", testEncoding),
         ("testDecoding", testDecoding)
     ]
diff --git a/Tests/PayPalTests/ModelTests/DiscountTests.swift b/Tests/PayPalTests/ModelTests/DiscountTests.swift
index b5e6c1d3..9ce59a22 100644
--- a/Tests/PayPalTests/ModelTests/DiscountTests.swift
+++ b/Tests/PayPalTests/ModelTests/DiscountTests.swift
@@ -3,15 +3,15 @@ import XCTest
 
 final class DiscountTests: XCTestCase {
     func testInit()throws {
-        let discount = try Discount(percent: 15, amount: Amount(currency: .usd, value: "1.25"))
+        let discount = Discount(percent: 15, amount: CurrencyAmount(currency: .usd, value: 1.25))
         
         XCTAssertEqual(discount.percent, 15)
-        try XCTAssertEqual(discount.amount, Amount(currency: .usd, value: "1.25"))
+        XCTAssertEqual(discount.amount, CurrencyAmount(currency: .usd, value: 1.25))
     }
     
     func testEncoding()throws {
         let encoder = JSONEncoder()
-        let discount = try Discount(percent: 15, amount: Amount(currency: .usd, value: "1.25"))
+        let discount = Discount(percent: 15, amount: CurrencyAmount(currency: .usd, value: 1.25))
         let json = try String(data: encoder.encode(discount), encoding: .utf8)
         
         XCTAssertEqual(json, "{\"percent\":15,\"amount\":{\"value\":\"1.25\",\"currency\":\"USD\"}}")
@@ -29,8 +29,8 @@ final class DiscountTests: XCTestCase {
         }
         """.data(using: .utf8)!
         
-        let discount = try Discount(percent: 15, amount: Amount(currency: .usd, value: "1.25"))
-        try XCTAssertEqual(discount, decoder.decode(Discount<Amount>.self, from: json))
+        let discount = Discount(percent: 15, amount: CurrencyAmount(currency: .usd, value: 1.25))
+        try XCTAssertEqual(discount, decoder.decode(Discount<CurrencyAmount>.self, from: json))
     }
     
     static var allTests: [(String, (DiscountTests) -> ()throws -> ())] = [
diff --git a/Tests/PayPalTests/ModelTests/DisplayPhoneTests.swift b/Tests/PayPalTests/ModelTests/DisplayPhoneTests.swift
index 006ec603..e3a8431f 100644
--- a/Tests/PayPalTests/ModelTests/DisplayPhoneTests.swift
+++ b/Tests/PayPalTests/ModelTests/DisplayPhoneTests.swift
@@ -3,25 +3,15 @@ import XCTest
 
 final class DisplayPhoneTests: XCTestCase {
     func testInit()throws {
-        let phone = try DisplayPhone(country: "US", number: "245364984688834")
+        let phone = DisplayPhone(country: .unitedStates, number: "245364984688834")
         
-        XCTAssertEqual(phone.country, "US")
+        XCTAssertEqual(phone.country, .unitedStates)
         XCTAssertEqual(phone.number, "245364984688834")
     }
     
-    func testValidations()throws {
-        try XCTAssertThrowsError(DisplayPhone(country: "usa", number: "245364984688834"))
-        var phone = try DisplayPhone(country: "US", number: "245364984688834")
-        
-        try XCTAssertThrowsError(phone.set(\.country <~ "usa"))
-        try phone.set(\.country <~ "UK")
-        
-        XCTAssertEqual(phone.country, "UK")
-    }
-    
     func testEncoding()throws {
         let encoder = JSONEncoder()
-        let phone = try DisplayPhone(country: "US", number: "245364984688834")
+        let phone = DisplayPhone(country: .unitedStates, number: "245364984688834")
         let generated = try String(data: encoder.encode(phone), encoding: .utf8)!
         let json = "{\"country_code\":\"US\",\"number\":\"245364984688834\"}"
         
@@ -51,12 +41,11 @@ final class DisplayPhoneTests: XCTestCase {
         """
         
         try XCTAssertThrowsError(decoder.decode(DisplayPhone.self, from: country))
-        try XCTAssertEqual(decoder.decode(DisplayPhone.self, from: json), DisplayPhone(country: "US", number: "245364984688834"))
+        try XCTAssertEqual(decoder.decode(DisplayPhone.self, from: json), DisplayPhone(country: .unitedStates, number: "245364984688834"))
     }
     
     static var allTests: [(String, (DisplayPhoneTests) -> ()throws -> ())] = [
         ("testInit", testInit),
-        ("testValidations", testValidations),
         ("testEncoding", testEncoding),
         ("testDecoding", testDecoding)
     ]
diff --git a/Tests/PayPalTests/ModelTests/DisputeOutcomeTests.swift b/Tests/PayPalTests/ModelTests/DisputeOutcomeTests.swift
index 3ea7b9bd..b24e27dd 100644
--- a/Tests/PayPalTests/ModelTests/DisputeOutcomeTests.swift
+++ b/Tests/PayPalTests/ModelTests/DisputeOutcomeTests.swift
@@ -3,15 +3,15 @@ import XCTest
 
 final class DisputeOutcomeTests: XCTestCase {
     func testInit()throws {
-        let outcome = try CustomerDispute.Outcome(code: .buyer, refunded: Money(currency: .usd, value: "56.72"))
+        let outcome = CustomerDispute.Outcome(code: .buyer, refunded: CurrencyCodeAmount(currency: .usd, value: 56.72))
         
         XCTAssertEqual(outcome.code, .buyer)
-        try XCTAssertEqual(outcome.refunded, Money(currency: .usd, value: "56.72"))
+        XCTAssertEqual(outcome.refunded, CurrencyCodeAmount(currency: .usd, value: 56.72))
     }
     
     func testEncoding()throws {
         let encoder = JSONEncoder()
-        let outcome = try CustomerDispute.Outcome(code: .buyer, refunded: Money(currency: .usd, value: "56.72"))
+        let outcome = CustomerDispute.Outcome(code: .buyer, refunded: CurrencyCodeAmount(currency: .usd, value: 56.72))
         let generated = try String(data: encoder.encode(outcome), encoding: .utf8)!
         
         XCTAssertEqual(generated, "{\"outcome_code\":\"RESOLVED_BUYER_FAVOUR\",\"amount_refunded\":{\"value\":\"56.72\",\"currency_code\":\"USD\"}}")
@@ -19,7 +19,7 @@ final class DisputeOutcomeTests: XCTestCase {
     
     func testDecoding()throws {
         let decoder = JSONDecoder()
-        let outcome = try CustomerDispute.Outcome(code: .buyer, refunded: Money(currency: .usd, value: "56.72"))
+        let outcome = CustomerDispute.Outcome(code: .buyer, refunded: CurrencyCodeAmount(currency: .usd, value: 56.72))
         let json = """
         {
             "outcome_code": "RESOLVED_BUYER_FAVOUR",
diff --git a/Tests/PayPalTests/ModelTests/DisputeResolutionOffer.swift b/Tests/PayPalTests/ModelTests/DisputeResolutionOffer.swift
index 3e51062a..23bb1d6d 100644
--- a/Tests/PayPalTests/ModelTests/DisputeResolutionOffer.swift
+++ b/Tests/PayPalTests/ModelTests/DisputeResolutionOffer.swift
@@ -5,7 +5,7 @@ final class DisputeResolutionOfferTests: XCTestCase {
     func testInit()throws {
         let offer = try CustomerDispute.ResolutionOffer(
             note: "Offer refund with replacement item.",
-            amount: Money(currency: .usd, value: "23"),
+            amount: CurrencyCodeAmount(currency: .usd, value: 23),
             type: .replacement,
             returnAddress: nil,
             invoiceID: nil
@@ -15,20 +15,20 @@ final class DisputeResolutionOfferTests: XCTestCase {
         XCTAssertNil(offer.returnAddress)
         XCTAssertEqual(offer.type, .replacement)
         XCTAssertEqual(offer.note, "Offer refund with replacement item.")
-        try XCTAssertEqual(offer.amount, Money(currency: .usd, value: "23"))
+        XCTAssertEqual(offer.amount, CurrencyCodeAmount(currency: .usd, value: 23))
     }
     
     func testValidations()throws {
         try XCTAssertThrowsError(CustomerDispute.ResolutionOffer(
             note: String(repeating: "n", count: 2001),
-            amount: Money(currency: .usd, value: "23"),
+            amount: CurrencyCodeAmount(currency: .usd, value: 23),
             type: .replacement,
             returnAddress: nil,
             invoiceID: nil
         ))
         try XCTAssertThrowsError(CustomerDispute.ResolutionOffer(
             note: "",
-            amount: Money(currency: .usd, value: "23"),
+            amount: CurrencyCodeAmount(currency: .usd, value: 23),
             type: .replacement,
             returnAddress: nil,
             invoiceID: nil
@@ -36,7 +36,7 @@ final class DisputeResolutionOfferTests: XCTestCase {
         
         var offer = try CustomerDispute.ResolutionOffer(
             note: "Offer refund with replacement item.",
-            amount: Money(currency: .usd, value: "23"),
+            amount: CurrencyCodeAmount(currency: .usd, value: 23),
             type: .replacement,
             returnAddress: nil,
             invoiceID: nil
@@ -52,7 +52,7 @@ final class DisputeResolutionOfferTests: XCTestCase {
         let encoder = JSONEncoder()
         let offer = try CustomerDispute.ResolutionOffer(
             note: "Notable note.",
-            amount: Money(currency: .usd, value: "23"),
+            amount: CurrencyCodeAmount(currency: .usd, value: 23),
             type: .replacement,
             returnAddress: nil,
             invoiceID: nil
@@ -107,7 +107,7 @@ final class DisputeResolutionOfferTests: XCTestCase {
         try XCTAssertThrowsError(decoder.decode(CustomerDispute.ResolutionOffer.self, from: noteShort))
         try XCTAssertEqual(decoder.decode(CustomerDispute.ResolutionOffer.self, from: json), CustomerDispute.ResolutionOffer(
             note: "Notable note.",
-            amount: Money(currency: .usd, value: "23"),
+            amount: CurrencyCodeAmount(currency: .usd, value: 23),
             type: .replacement,
             returnAddress: nil,
             invoiceID: nil
diff --git a/Tests/PayPalTests/ModelTests/EstablishmentTests.swift b/Tests/PayPalTests/ModelTests/EstablishmentTests.swift
index ea280ace..5e327994 100644
--- a/Tests/PayPalTests/ModelTests/EstablishmentTests.swift
+++ b/Tests/PayPalTests/ModelTests/EstablishmentTests.swift
@@ -3,25 +3,15 @@ import XCTest
 
 final class EstablishmentTests: XCTestCase {
     func testInit()throws {
-        let bank = try Establishment(state: "OR", country: "US")
+        let bank = Establishment(state: .or, country: .unitedStates)
         
-        XCTAssertEqual(bank.state, "OR")
-        XCTAssertEqual(bank.country, "US")
-    }
-    
-    func testValidations()throws {
-        try XCTAssertThrowsError(Establishment(state: "OR", country: "usa"))
-        var bank = try Establishment(state: "OR", country: "US")
-        
-        try XCTAssertThrowsError(bank.set(\.country <~ "usa"))
-        try bank.set(\.country <~ "GB")
-        
-        XCTAssertEqual(bank.country, "GB")
+        XCTAssertEqual(bank.state, .or)
+        XCTAssertEqual(bank.country, .unitedStates)
     }
     
     func testEncoding()throws {
         let encoder = JSONEncoder()
-        let bank = try Establishment(state: "OR", country: "US")
+        let bank = Establishment(state: .or, country: .unitedStates)
         let generated = try String(data: encoder.encode(bank), encoding: .utf8)!
         
         XCTAssertEqual(generated, "{\"state\":\"OR\",\"country_code\":\"US\"}")
@@ -43,12 +33,11 @@ final class EstablishmentTests: XCTestCase {
         """
         
         try XCTAssertThrowsError(decoder.decode(Establishment.self, from: country))
-        try XCTAssertEqual(decoder.decode(Establishment.self, from: json), Establishment(state: "OR", country: "US"))
+        try XCTAssertEqual(decoder.decode(Establishment.self, from: json), Establishment(state: .or, country: .unitedStates))
     }
     
     static var allTests: [(String, (EstablishmentTests) -> ()throws -> ())] = [
         ("testInit", testInit),
-        ("testValidations", testValidations),
         ("testEncoding", testEncoding),
         ("testDecoding", testDecoding)
     ]
diff --git a/Tests/PayPalTests/ModelTests/FinancialInstrumentTests.swift b/Tests/PayPalTests/ModelTests/FinancialInstrumentTests.swift
index b8159e4e..7c20b42a 100644
--- a/Tests/PayPalTests/ModelTests/FinancialInstrumentTests.swift
+++ b/Tests/PayPalTests/ModelTests/FinancialInstrumentTests.swift
@@ -3,10 +3,9 @@ import XCTest
 
 final class FinancialInstrumentTests: XCTestCase {
     func testInit()throws {
-        let id = UUID().uuidString
-        let instrument = FinancialInstrument(id: id)
+        let instrument = FinancialInstrument()
         
-        XCTAssertEqual(instrument.id, id)
+        XCTAssertNil(instrument.id)
         XCTAssertEqual(instrument.type, .bank)
         XCTAssertEqual(instrument.accountType, .checking)
         
@@ -18,26 +17,23 @@ final class FinancialInstrumentTests: XCTestCase {
     func testEncoding()throws {
         let encoder = JSONEncoder()
         
-        let id = UUID().uuidString
-        let instrument = FinancialInstrument(id: id)
+        let instrument = FinancialInstrument()
         let object = try String(data: encoder.encode(instrument), encoding: .utf8)
-        XCTAssertEqual(object, "{\"type\":\"BANK\",\"id\":\"\(id)\",\"account_type\":\"CHECKING\"}")
+        XCTAssertEqual(object, "{\"type\":\"BANK\",\"account_type\":\"CHECKING\"}")
         
         let instruments = FinancialInstruments(instruments: [instrument])
         let array = try String(data: encoder.encode(instruments), encoding: .utf8)
-        XCTAssertEqual(array, "{\"financial_instruments\":[{\"type\":\"BANK\",\"id\":\"\(id)\",\"account_type\":\"CHECKING\"}]}")
+        XCTAssertEqual(array, "{\"financial_instruments\":[{\"type\":\"BANK\",\"account_type\":\"CHECKING\"}]}")
         
     }
     
     func testDecoding()throws {
         let decoder = JSONDecoder()
-        let id = UUID().uuidString
         
         let object = """
         {
             "account_type": "CHECKING",
-            "type": "BANK",
-            "id": "\(id)"
+            "type": "BANK"
         }
         """.data(using: .utf8)!
         let array = """
@@ -45,15 +41,14 @@ final class FinancialInstrumentTests: XCTestCase {
             "financial_instruments": [
                 {
                     "account_type": "CHECKING",
-                    "type": "BANK",
-                    "id": "\(id)"
+                    "type": "BANK"
                 }
             ]
         }
         """.data(using: .utf8)!
         
-        try XCTAssertEqual(FinancialInstrument(id: id), decoder.decode(FinancialInstrument.self, from: object))
-        try XCTAssertEqual(FinancialInstruments(instruments: [FinancialInstrument(id: id)]), decoder.decode(FinancialInstruments.self, from: array))
+        try XCTAssertEqual(FinancialInstrument(), decoder.decode(FinancialInstrument.self, from: object))
+        try XCTAssertEqual(FinancialInstruments(instruments: [FinancialInstrument()]), decoder.decode(FinancialInstruments.self, from: array))
     }
     
     static var allTests: [(String, (FinancialInstrumentTests) -> ()throws -> ())] = [
diff --git a/Tests/PayPalTests/ModelTests/InvoiceItemTests.swift b/Tests/PayPalTests/ModelTests/InvoiceItemTests.swift
index a7ef674a..8a2a28a6 100644
--- a/Tests/PayPalTests/ModelTests/InvoiceItemTests.swift
+++ b/Tests/PayPalTests/ModelTests/InvoiceItemTests.swift
@@ -9,8 +9,8 @@ final class InvoiceItemTests: XCTestCase {
             name: "Widget",
             description: "Round and white, like a ping-pong ball",
             quantity: 3,
-            unitPrice: Amount(currency: .usd, value: "50"),
-            tax: Tax(name: "Sales", percent: 10, amount: Amount(currency: .usd, value: "5.00")),
+            unitPrice: CurrencyAmount(currency: .usd, value: 50),
+            tax: Tax(name: "Sales", percent: 10, amount: CurrencyAmount(currency: .usd, value: 5.00)),
             date: self.now,
             discount: nil,
             unitMeasure: .quantity
@@ -22,8 +22,8 @@ final class InvoiceItemTests: XCTestCase {
         XCTAssertEqual(item.quantity, 3)
         XCTAssertEqual(item.date, self.now)
         XCTAssertEqual(item.unitMeasure, .quantity)
-        try XCTAssertEqual(item.unitPrice, Amount(currency: .usd, value: "50"))
-        try XCTAssertEqual(item.tax, Tax(name: "Sales", percent: 10, amount: Amount(currency: .usd, value: "5.00")))
+        XCTAssertEqual(item.unitPrice, CurrencyAmount(currency: .usd, value: 50))
+        try XCTAssertEqual(item.tax, Tax(name: "Sales", percent: 10, amount: CurrencyAmount(currency: .usd, value: 5.00)))
     }
     
     func testValidations()throws {
@@ -31,7 +31,7 @@ final class InvoiceItemTests: XCTestCase {
             name: String(repeating: "n", count: 201),
             description: "Round and white, like a ping-pong ball",
             quantity: 3,
-            unitPrice: Amount(currency: .usd, value: "50"),
+            unitPrice: CurrencyAmount(currency: .usd, value: 50),
             tax: nil,
             date: nil,
             discount: nil,
@@ -41,7 +41,7 @@ final class InvoiceItemTests: XCTestCase {
             name: "Widget",
             description: String(repeating: "d", count: 1001),
             quantity: 3,
-            unitPrice: Amount(currency: .usd, value: "50"),
+            unitPrice: CurrencyAmount(currency: .usd, value: 50),
             tax: nil,
             date: nil,
             discount: nil,
@@ -51,7 +51,7 @@ final class InvoiceItemTests: XCTestCase {
             name: "Widget",
             description: "Round and white, like a ping-pong ball",
             quantity: -10_001,
-            unitPrice: Amount(currency: .usd, value: "50"),
+            unitPrice: CurrencyAmount(currency: .usd, value: 50),
             tax: nil,
             date: nil,
             discount: nil,
@@ -61,7 +61,7 @@ final class InvoiceItemTests: XCTestCase {
             name: "Widget",
             description: "Round and white, like a ping-pong ball",
             quantity: 3,
-            unitPrice: Amount(currency: .usd, value: "1000001"),
+            unitPrice: CurrencyAmount(currency: .usd, value: 1000001),
             tax: nil,
             date: nil,
             discount: nil,
@@ -72,8 +72,8 @@ final class InvoiceItemTests: XCTestCase {
             name: "Widget",
             description: "Round and white, like a ping-pong ball",
             quantity: 3,
-            unitPrice: Amount(currency: .usd, value: "50"),
-            tax: Tax(name: "Sales", percent: 10, amount: Amount(currency: .usd, value: "5.00")),
+            unitPrice: CurrencyAmount(currency: .usd, value: 50),
+            tax: Tax(name: "Sales", percent: 10, amount: CurrencyAmount(currency: .usd, value: 5.00)),
             date: self.now,
             discount: nil,
             unitMeasure: .quantity
@@ -83,17 +83,17 @@ final class InvoiceItemTests: XCTestCase {
         try XCTAssertThrowsError(item.set(\Invoice.Item.description <~ String(repeating: "d", count: 1001)))
         try XCTAssertThrowsError(item.set(\.quantity <~ -10_001))
         try XCTAssertThrowsError(
-            item.set(\.unitPrice <~ Amount(currency: .usd, value: "1000001"))
+            item.set(\.unitPrice <~ CurrencyAmount(currency: .usd, value: 1000001))
         )
         try item.set(\.name <~ String(repeating: "n", count: 200))
         try item.set(\Invoice.Item.description <~ String(repeating: "d", count: 1000))
         try item.set(\.quantity <~ -10_000)
-        try item.set(\.unitPrice <~ Amount(currency: .usd, value: "50"))
+        try item.set(\.unitPrice <~ CurrencyAmount(currency: .usd, value: 50))
         
         XCTAssertEqual(item.name, String(repeating: "n", count: 200))
         XCTAssertEqual(item.description, String(repeating: "d", count: 1000))
         XCTAssertEqual(item.quantity, -10_000)
-        try XCTAssertEqual(item.unitPrice, Amount(currency: .usd, value: "50"))
+        XCTAssertEqual(item.unitPrice, CurrencyAmount(currency: .usd, value: 50))
     }
     
     func testEncoding()throws {
@@ -102,7 +102,7 @@ final class InvoiceItemTests: XCTestCase {
             name: "Widget",
             description: "Round and white, like a ping-pong ball",
             quantity: 3,
-            unitPrice: Amount(currency: .usd, value: "50"),
+            unitPrice: CurrencyAmount(currency: .usd, value: 50),
             tax: nil,
             date: self.now,
             discount: nil,
@@ -127,7 +127,7 @@ final class InvoiceItemTests: XCTestCase {
             name: "Widget",
             description: "Round and white, like a ping-pong ball",
             quantity: 3,
-            unitPrice: Amount(currency: .usd, value: "50"),
+            unitPrice: CurrencyAmount(currency: .usd, value: 50),
             tax: nil,
             date: self.now,
             discount: nil,
diff --git a/Tests/PayPalTests/ModelTests/InvoiceListTests.swift b/Tests/PayPalTests/ModelTests/InvoiceListTests.swift
index 693df936..11a8295c 100644
--- a/Tests/PayPalTests/ModelTests/InvoiceListTests.swift
+++ b/Tests/PayPalTests/ModelTests/InvoiceListTests.swift
@@ -28,9 +28,9 @@ final class InvoiceListTests: XCTestCase {
             reference: "PO number",
             discount: nil,
             shippingCost: nil,
-            custom: CustomAmount(label: nil, amount: Amount(currency: .usd, value: "10.00")),
+            custom: CustomAmount(label: nil, amount: CurrencyAmount(currency: .usd, value: 10.00)),
             allowPartialPayment: false,
-            minimumDue: Amount(currency: .usd, value: "1.00"),
+            minimumDue: CurrencyAmount(currency: .usd, value: 1.00),
             taxCalculatedAfterDiscount: true,
             taxInclusive: true,
             terms: nil,
@@ -68,9 +68,9 @@ final class InvoiceListTests: XCTestCase {
             reference: "PO number",
             discount: nil,
             shippingCost: nil,
-            custom: CustomAmount(label: nil, amount: Amount(currency: .usd, value: "10.00")),
+            custom: CustomAmount(label: nil, amount: CurrencyAmount(currency: .usd, value: 10.00)),
             allowPartialPayment: false,
-            minimumDue: Amount(currency: .usd, value: "1.00"),
+            minimumDue: CurrencyAmount(currency: .usd, value: 1.00),
             taxCalculatedAfterDiscount: true,
             taxInclusive: true,
             terms: nil,
diff --git a/Tests/PayPalTests/ModelTests/InvoicePaymentTests.swift b/Tests/PayPalTests/ModelTests/InvoicePaymentTests.swift
index 3f1e53a6..5e8adcf1 100644
--- a/Tests/PayPalTests/ModelTests/InvoicePaymentTests.swift
+++ b/Tests/PayPalTests/ModelTests/InvoicePaymentTests.swift
@@ -5,17 +5,17 @@ final class InvoicePaymentTests: XCTestCase {
     let now = Date().iso8601
     
     func testInit()throws {
-        let payment = try Invoice.Payment(method: .cash, amount: Amount(currency: .usd, value: "20.00"), date: self.now, note: "I got the payment by cash!")
+        let payment = Invoice.Payment(method: .cash, amount: CurrencyAmount(currency: .usd, value: 20.00), date: self.now, note: "I got the payment by cash!")
         
         XCTAssertEqual(payment.method, .cash)
         XCTAssertEqual(payment.date, self.now)
         XCTAssertEqual(payment.note, "I got the payment by cash!")
-        try XCTAssertEqual(payment.amount, Amount(currency: .usd, value: "20.00"))
+        XCTAssertEqual(payment.amount, CurrencyAmount(currency: .usd, value: 20.00))
     }
     
     func testEncoding()throws {
         let encoder = JSONEncoder()
-        let payment = try Invoice.Payment(method: .cash, amount: Amount(currency: .usd, value: "20.00"), date: self.now, note: "I got the payment by cash!")
+        let payment = Invoice.Payment(method: .cash, amount: CurrencyAmount(currency: .usd, value: 20.00), date: self.now, note: "I got the payment by cash!")
         let generated = try String(data: encoder.encode(payment), encoding: .utf8)!
         let json = "{\"amount\":{\"value\":\"20.00\",\"currency\":\"USD\"},\"method\":\"CASH\",\"note\":\"I got the payment by cash!\",\"date\":\"\(self.now)\"}"
         
@@ -31,7 +31,7 @@ final class InvoicePaymentTests: XCTestCase {
     
     func testDecoding()throws {
         let decoder = JSONDecoder()
-        let payment = try Invoice.Payment(method: .cash, amount: Amount(currency: .usd, value: "20.00"), date: self.now, note: "I got the payment by cash!")
+        let payment = Invoice.Payment(method: .cash, amount: CurrencyAmount(currency: .usd, value: 20.00), date: self.now, note: "I got the payment by cash!")
         
         let json = """
         {
diff --git a/Tests/PayPalTests/ModelTests/InvoiceTests.swift b/Tests/PayPalTests/ModelTests/InvoiceTests.swift
index f3267a10..20ba0b16 100644
--- a/Tests/PayPalTests/ModelTests/InvoiceTests.swift
+++ b/Tests/PayPalTests/ModelTests/InvoiceTests.swift
@@ -28,9 +28,9 @@ final class InvoiceTests: XCTestCase {
             reference: "PO number",
             discount: nil,
             shippingCost: nil,
-            custom: CustomAmount(label: nil, amount: Amount(currency: .usd, value: "10.00")),
+            custom: CustomAmount(label: nil, amount: CurrencyAmount(currency: .usd, value: 10.00)),
             allowPartialPayment: false,
-            minimumDue: Amount(currency: .usd, value: "1.00"),
+            minimumDue: CurrencyAmount(currency: .usd, value: 1.00),
             taxCalculatedAfterDiscount: true,
             taxInclusive: true,
             terms: nil,
@@ -69,7 +69,7 @@ final class InvoiceTests: XCTestCase {
         XCTAssertEqual(invoice.allowTip, true)
         XCTAssertEqual(invoice.template, "PayPal system template")
         
-        try XCTAssertEqual(invoice.custom, CustomAmount(label: nil, amount: Amount(currency: .usd, value: "10.00")))
+        XCTAssertEqual(invoice.custom, CustomAmount(label: nil, amount: CurrencyAmount(currency: .usd, value: 10.00)))
         try XCTAssertEqual(invoice.cc, [Invoice.Participant(email: "collective@vapor.codes"), Invoice.Participant(email: "donator@example.com")])
         try XCTAssertEqual(invoice.merchant, MerchantInfo(
             email: "hello@vapor.codes",
@@ -190,9 +190,9 @@ final class InvoiceTests: XCTestCase {
             reference: "PO number",
             discount: nil,
             shippingCost: nil,
-            custom: CustomAmount(label: nil, amount: Amount(currency: .usd, value: "10.00")),
+            custom: CustomAmount(label: nil, amount: CurrencyAmount(currency: .usd, value: 10.00)),
             allowPartialPayment: false,
-            minimumDue: Amount(currency: .usd, value: "1.00"),
+            minimumDue: CurrencyAmount(currency: .usd, value: 1.00),
             taxCalculatedAfterDiscount: true,
             taxInclusive: true,
             terms: nil,
@@ -364,9 +364,9 @@ final class InvoiceTests: XCTestCase {
             reference: "PO number",
             discount: nil,
             shippingCost: nil,
-            custom: CustomAmount(label: nil, amount: Amount(currency: .usd, value: "10.00")),
+            custom: CustomAmount(label: nil, amount: CurrencyAmount(currency: .usd, value: 10.00)),
             allowPartialPayment: false,
-            minimumDue: Amount(currency: .usd, value: "1.00"),
+            minimumDue: CurrencyAmount(currency: .usd, value: 1.00),
             taxCalculatedAfterDiscount: true,
             taxInclusive: true,
             terms: nil,
diff --git a/Tests/PayPalTests/ModelTests/MerchantPreferancesTests.swift b/Tests/PayPalTests/ModelTests/MerchantPreferancesTests.swift
index b458e262..951a577f 100644
--- a/Tests/PayPalTests/ModelTests/MerchantPreferancesTests.swift
+++ b/Tests/PayPalTests/ModelTests/MerchantPreferancesTests.swift
@@ -4,7 +4,7 @@ import XCTest
 final class MerchantPreferancesTests: XCTestCase {
     func testInit()throws {
         let preferances = try MerchantPreferances(
-            setupFee: Money(currency: .usd, value: "0"),
+            setupFee: CurrencyCodeAmount(currency: .usd, value: 0),
             cancelURL: "https://example.com/agreements",
             returnURL: "https://example.com/agreements/latest",
             autoBill: .yes,
@@ -13,7 +13,7 @@ final class MerchantPreferancesTests: XCTestCase {
             charSet: "UTF-8"
         )
         
-        try XCTAssertEqual(preferances.setupFee, Money(currency: .usd, value: "0"))
+        XCTAssertEqual(preferances.setupFee, CurrencyCodeAmount(currency: .usd, value: 0))
         XCTAssertEqual(preferances.id, nil)
         XCTAssertEqual(preferances.cancelURL, "https://example.com/agreements")
         XCTAssertEqual(preferances.returnURL, "https://example.com/agreements/latest")
@@ -27,7 +27,7 @@ final class MerchantPreferancesTests: XCTestCase {
     func testEncoding()throws {
         let encoder = JSONEncoder()
         let preferances = try MerchantPreferances(
-            setupFee: Money(currency: .usd, value: "0"),
+            setupFee: CurrencyCodeAmount(currency: .usd, value: 0),
             cancelURL: "https://example.com/agreements",
             returnURL: "https://example.com/agreements/latest",
             autoBill: .yes,
@@ -70,7 +70,7 @@ final class MerchantPreferancesTests: XCTestCase {
         }
         """.data(using: .utf8)!
         let preferances = try MerchantPreferances(
-            setupFee: Money(currency: .usd, value: "0"),
+            setupFee: CurrencyCodeAmount(currency: .usd, value: 0),
             cancelURL: "https://example.com/agreements",
             returnURL: "https://example.com/agreements/latest",
             autoBill: .yes,
diff --git a/Tests/PayPalTests/ModelTests/MoneyRangeTests.swift b/Tests/PayPalTests/ModelTests/MoneyRangeTests.swift
index 298bd36a..107fac72 100644
--- a/Tests/PayPalTests/ModelTests/MoneyRangeTests.swift
+++ b/Tests/PayPalTests/ModelTests/MoneyRangeTests.swift
@@ -3,18 +3,18 @@ import XCTest
 
 final class MoneyRangeTests: XCTestCase {
     func testInit()throws {
-        let range0 = try MoneyRange(min: Money(currency: .usd, value: "12.25"), max: Money(currency: .usd, value: "50.00"))
-        try XCTAssertEqual(range0.minimum, Money(currency: .usd, value: "12.25"))
-        try XCTAssertEqual(range0.maximum, Money(currency: .usd, value: "50.00"))
+        let range0 = MoneyRange(min: CurrencyCodeAmount(currency: .usd, value: 12.25), max: CurrencyCodeAmount(currency: .usd, value: 50.00))
+        XCTAssertEqual(range0.minimum, CurrencyCodeAmount(currency: .usd, value: 12.25))
+        XCTAssertEqual(range0.maximum, CurrencyCodeAmount(currency: .usd, value: 50.00))
         
-        let range1 = try MoneyRange<Money>("12.25"..."50.00", currency: .usd)
-        try XCTAssertEqual(range1.minimum, Money(currency: .usd, value: "12.25"))
-        try XCTAssertEqual(range1.maximum, Money(currency: .usd, value: "50.00"))
+        let range1 = MoneyRange<CurrencyCodeAmount>(12.25...50.00, currency: .usd)
+        XCTAssertEqual(range1.minimum, CurrencyCodeAmount(currency: .usd, value: 12.25))
+        XCTAssertEqual(range1.maximum, CurrencyCodeAmount(currency: .usd, value: 50.00))
     }
     
     func testEncoding()throws {
         let encoder = JSONEncoder()
-        let range = try MoneyRange(min: Money(currency: .usd, value: "12.25"), max: Money(currency: .usd, value: "50.00"))
+        let range = MoneyRange(min: CurrencyCodeAmount(currency: .usd, value: 12.25), max: CurrencyCodeAmount(currency: .usd, value: 50.00))
         let generated = try String(data: encoder.encode(range), encoding: .utf8)
         let json = "{\"minimum_amount\":{\"value\":\"12.25\",\"currency_code\":\"USD\"},\"maximum_amount\":{\"value\":\"50.00\",\"currency_code\":\"USD\"}}"
         
@@ -36,7 +36,7 @@ final class MoneyRangeTests: XCTestCase {
         }
         """.data(using: .utf8)!
         
-        let range = try MoneyRange(min: Money(currency: .usd, value: "12.25"), max: Money(currency: .usd, value: "50.00"))
+        let range = MoneyRange(min: CurrencyCodeAmount(currency: .usd, value: 12.25), max: CurrencyCodeAmount(currency: .usd, value: 50.00))
         try XCTAssertEqual(range, decoder.decode(MoneyRange.self, from: json))
     }
     
diff --git a/Tests/PayPalTests/ModelTests/MoneyTests.swift b/Tests/PayPalTests/ModelTests/MoneyTests.swift
index 69f95a37..fb739bc4 100644
--- a/Tests/PayPalTests/ModelTests/MoneyTests.swift
+++ b/Tests/PayPalTests/ModelTests/MoneyTests.swift
@@ -2,25 +2,18 @@ import XCTest
 @testable import PayPal
 
 final class MoneyTests: XCTestCase {
-    func testValueValidation()throws {
-        try XCTAssertThrowsError(Money(currency: .usd, value: String(repeating: "1", count: 33)))
-        try XCTAssertThrowsError(Money(currency: .usd, value: "1945r"))
-        try XCTAssertThrowsError(Money(currency: .usd, value: "88*99"))
+    func testInit()throws {
+        let amount = CurrencyAmount(currency: .aud, value: 10.25)
         
-        var test = try Money(currency: .ang, value: "-32.4")
-        XCTAssertEqual(test.currency, .ang)
-        XCTAssertEqual(test.value, "-32.4")
-        
-        test.currency = .xxx
-        try test.set(\.value <~ "88")
-        XCTAssertEqual(test.value, "88")
+        XCTAssertEqual(amount.currency, .aud)
+        XCTAssertEqual(amount.value, 10.25)
     }
     
     func testEncoding()throws {
         let encoder = JSONEncoder()
-        let usd = try String(data: encoder.encode(Money(currency: .usd, value: "12.25")), encoding: .utf8)
-        let xxx = try String(data: encoder.encode(Money(currency: .xxx, value: "0")), encoding: .utf8)
-        let eur = try String(data: encoder.encode(Money(currency: .eur, value: "4.5")), encoding: .utf8)
+        let usd = try String(data: encoder.encode(CurrencyCodeAmount(currency: .usd, value: 12.2471)), encoding: .utf8)
+        let xxx = try String(data: encoder.encode(CurrencyCodeAmount(currency: .xxx, value: 0)), encoding: .utf8)
+        let eur = try String(data: encoder.encode(CurrencyCodeAmount(currency: .eur, value: 4.5)), encoding: .utf8)
         
         XCTAssertEqual(usd, "{\"value\":\"12.25\",\"currency_code\":\"USD\"}")
         XCTAssertEqual(xxx, "{\"value\":\"0\",\"currency_code\":\"XXX\"}")
@@ -35,7 +28,7 @@ final class MoneyTests: XCTestCase {
             "currency_code": "EEE"
         }
         """.data(using: .utf8)!
-        let valueFail = """
+        let valueParse = """
         {
             "value": "33.y",
             "currency_code": "USD"
@@ -48,13 +41,13 @@ final class MoneyTests: XCTestCase {
         }
         """.data(using: .utf8)!
         
-        try XCTAssertThrowsError(decoder.decode(Money.self, from: codeFail))
-        try XCTAssertThrowsError(decoder.decode(Money.self, from: valueFail))
-        try XCTAssertEqual(Money(currency: .eur, value: "50.52"), decoder.decode(Money.self, from: valid))
+        try XCTAssertThrowsError(decoder.decode(CurrencyCodeAmount.self, from: codeFail))
+        try XCTAssertEqual(CurrencyCodeAmount(currency: .eur, value: 50.52), decoder.decode(CurrencyCodeAmount.self, from: valid))
+        try XCTAssertEqual(CurrencyCodeAmount(currency: .usd, value: 33), decoder.decode(CurrencyCodeAmount.self, from: valueParse))
     }
     
     static var allTests: [(String, (MoneyTests) -> ()throws -> ())] = [
-        ("testValueValidation", testValueValidation),
+        ("testInit", testInit),
         ("testEncoding", testEncoding),
         ("testDecoding", testDecoding)
     ]
diff --git a/Tests/PayPalTests/ModelTests/OfferTests.swift b/Tests/PayPalTests/ModelTests/OfferTests.swift
index 428c89e3..d6339efa 100644
--- a/Tests/PayPalTests/ModelTests/OfferTests.swift
+++ b/Tests/PayPalTests/ModelTests/OfferTests.swift
@@ -3,16 +3,16 @@ import XCTest
 
 final class OfferTests: XCTestCase {
     func testInit()throws {
-        let offer = try Offer(buyerAmount: Money(currency: .usd, value: "10.99"), sellerAmount: Money(currency: .usd, value: "10.99"), type: .refund)
+        let offer = Offer(buyerAmount: CurrencyCodeAmount(currency: .usd, value: 10.99), sellerAmount: CurrencyCodeAmount(currency: .usd, value: 10.99), type: .refund)
         
         XCTAssertEqual(offer.type, .refund)
-        try XCTAssertEqual(offer.sellerAmount, Money(currency: .usd, value: "10.99"))
-        try XCTAssertEqual(offer.buyerAmount, Money(currency: .usd, value: "10.99"))
+        XCTAssertEqual(offer.sellerAmount, CurrencyCodeAmount(currency: .usd, value: 10.99))
+        XCTAssertEqual(offer.buyerAmount, CurrencyCodeAmount(currency: .usd, value: 10.99))
     }
     
     func testEncoding()throws {
         let encoder = JSONEncoder()
-        let offer = try Offer(buyerAmount: Money(currency: .usd, value: "10.99"), sellerAmount: Money(currency: .usd, value: "10.99"), type: .refund)
+        let offer = Offer(buyerAmount: CurrencyCodeAmount(currency: .usd, value: 10.99), sellerAmount: CurrencyCodeAmount(currency: .usd, value: 10.99), type: .refund)
         let generated = try String(data: encoder.encode(offer), encoding: .utf8)
         let json =
             "{\"offer_type\":\"REFUND\",\"buyer_requested_amount\":{\"value\":\"10.99\",\"currency_code\":\"USD\"}," +
@@ -36,7 +36,7 @@ final class OfferTests: XCTestCase {
             }
         }
         """.data(using: .utf8)!
-        let offer = try Offer(buyerAmount: Money(currency: .usd, value: "10.99"), sellerAmount: Money(currency: .usd, value: "10.99"), type: .refund)
+        let offer = Offer(buyerAmount: CurrencyCodeAmount(currency: .usd, value: 10.99), sellerAmount: CurrencyCodeAmount(currency: .usd, value: 10.99), type: .refund)
         
         try XCTAssertEqual(decoder.decode(Offer.self, from: json), offer)
     }
diff --git a/Tests/PayPalTests/ModelTests/OrderPayerInfoTests.swift b/Tests/PayPalTests/ModelTests/OrderPayerInfoTests.swift
index b253b339..dec5f094 100644
--- a/Tests/PayPalTests/ModelTests/OrderPayerInfoTests.swift
+++ b/Tests/PayPalTests/ModelTests/OrderPayerInfoTests.swift
@@ -8,10 +8,10 @@ final class OrderPayerInfoTests: XCTestCase {
             birthdate: "2018-09-20T17:49:17+0000",
             tax: "85323EC0-A9114",
             taxType: .cpf,
-            country: "US",
+            country: .unitedStates,
             billing: Address(
-                recipientName: nil, defaultAddress: nil, line1: "Plum Fairy Ln.", line2: nil, city: "Ginger Planes", state: "CC",
-                countryCode: "PU", postalCode: "3552", phone: nil, type: nil
+                recipientName: nil, defaultAddress: nil, line1: "Plum Fairy Ln.", line2: nil, city: "Ginger Planes", state: .le,
+                country: .wallisFutuna, postalCode: "3552", phone: nil, type: nil
             )
         )
         
@@ -26,40 +26,40 @@ final class OrderPayerInfoTests: XCTestCase {
         XCTAssertEqual(info.birthdate, "2018-09-20T17:49:17+0000")
         XCTAssertEqual(info.tax, "85323EC0-A9114")
         XCTAssertEqual(info.taxType, .cpf)
-        XCTAssertEqual(info.country, "US")
-        try XCTAssertEqual(info.billing, Address(
-            recipientName: nil, defaultAddress: nil, line1: "Plum Fairy Ln.", line2: nil, city: "Ginger Planes", state: "CC",
-            countryCode: "PU", postalCode: "3552", phone: nil, type: nil
+        XCTAssertEqual(info.country, .unitedStates)
+        XCTAssertEqual(info.billing, Address(
+            recipientName: nil, defaultAddress: nil, line1: "Plum Fairy Ln.", line2: nil, city: "Ginger Planes", state: .le,
+            country: .wallisFutuna, postalCode: "3552", phone: nil, type: nil
         ))
     }
     
     func testValidations()throws {
-        try XCTAssertThrowsError(Order.Payer.Info(email: String(repeating: "e", count: 128), birthdate: nil, tax: nil, taxType: nil, country: nil, billing: nil))
-        try XCTAssertThrowsError(Order.Payer.Info(email: nil, birthdate: nil, tax: String(repeating: "t", count: 15), taxType: nil, country: nil, billing: nil))
-        try XCTAssertThrowsError(Order.Payer.Info(email: nil, birthdate: nil, tax: nil, taxType: nil, country: "usa", billing: nil))
+        try XCTAssertThrowsError(
+            Order.Payer.Info(email: String(repeating: "e", count: 128), birthdate: nil, tax: nil, taxType: nil, country: nil, billing: nil)
+        )
+        try XCTAssertThrowsError(
+            Order.Payer.Info(email: nil, birthdate: nil, tax: String(repeating: "t", count: 15), taxType: nil, country: nil, billing: nil)
+        )
         var info = try Order.Payer.Info(
             email: "email@example.com",
             birthdate: "2018-09-20T17:49:17+0000",
             tax: "85323EC0-A9114",
             taxType: .cpf,
-            country: "US",
+            country: .unitedStates,
             billing: Address(
-                recipientName: nil, defaultAddress: nil, line1: "Plum Fairy Ln.", line2: nil, city: "Ginger Planes", state: "CC",
-                countryCode: "PU", postalCode: "3552", phone: nil, type: nil
+                recipientName: nil, defaultAddress: nil, line1: "Plum Fairy Ln.", line2: nil, city: "Ginger Planes", state: .le,
+                country: .wallisFutuna, postalCode: "3552", phone: nil, type: nil
             )
         )
         
         try XCTAssertThrowsError(info.set(\Order.Payer.Info.email <~ String(repeating: "e", count: 128)))
         try XCTAssertThrowsError(info.set(\Order.Payer.Info.tax <~ String(repeating: "t", count: 15)))
-        try XCTAssertThrowsError(info.set(\Order.Payer.Info.country <~ "usa"))
         try info.set(\Order.Payer.Info.email <~ String(repeating: "e", count: 127))
         try info.set(\Order.Payer.Info.tax <~ String(repeating: "t", count: 14))
-        try info.set(\Order.Payer.Info.country <~ "AU")
         
         
         XCTAssertEqual(info.email, String(repeating: "e", count: 127))
         XCTAssertEqual(info.tax, String(repeating: "t", count: 14))
-        XCTAssertEqual(info.country, "AU")
     }
     
     func testEncoding()throws {
@@ -69,15 +69,15 @@ final class OrderPayerInfoTests: XCTestCase {
             birthdate: "2018-09-20",
             tax: "85323EC0-A9114",
             taxType: .cpf,
-            country: "US",
+            country: .unitedStates,
             billing: Address(
-                recipientName: nil, defaultAddress: nil, line1: "Plum Fairy Ln.", line2: nil, city: "Ginger Planes", state: "CC",
-                countryCode: "PU", postalCode: "3552", phone: nil, type: nil
+                recipientName: nil, defaultAddress: nil, line1: "Plum Fairy Ln.", line2: nil, city: "Ginger Planes", state: .le,
+                country: .wallisFutuna, postalCode: "3552", phone: nil, type: nil
             )
         )
         let generated = try String(data: encoder.encode(info), encoding: .utf8)!
         let json =
-        "{\"email\":\"email@example.com\",\"tax_id\":\"85323EC0-A9114\",\"country_code\":\"US\",\"birth_date\":\"2018-09-20\",\"billing_address\":{\"country_code\":\"PU\",\"state\":\"CC\",\"line1\":\"Plum Fairy Ln.\",\"city\":\"Ginger Planes\",\"postal_code\":\"3552\"},\"tax_id_type\":\"BR_CPF\"}"
+        "{\"email\":\"email@example.com\",\"tax_id\":\"85323EC0-A9114\",\"country_code\":\"US\",\"birth_date\":\"2018-09-20\",\"billing_address\":{\"country_code\":\"WF\",\"state\":\"LE\",\"line1\":\"Plum Fairy Ln.\",\"city\":\"Ginger Planes\",\"postal_code\":\"3552\"},\"tax_id_type\":\"BR_CPF\"}"
         
         var index = 0
         for (jsonChar, genChar) in zip(json, generated) {
@@ -102,9 +102,9 @@ final class OrderPayerInfoTests: XCTestCase {
             "billing_address": {
                 "postal_code": "3552",
                 "city": "Ginger Planes",
-                "country_code": "PU",
+                "country_code": "WF",
                 "line1": "Plum Fairy Ln.",
-                "state": "CC"
+                "state": "LE"
             },
             "country_code": "US",
             "tax_id_type": "BR_CPF",
@@ -121,14 +121,14 @@ final class OrderPayerInfoTests: XCTestCase {
         XCTAssertEqual(info.lastname, "White")
         XCTAssertEqual(info.suffix, "H.M.")
         XCTAssertEqual(info.payer, "A8B9EE88-D7AF-4F8C-B6BC-70809F2DE8C1")
-        XCTAssertEqual(info.country, "US")
+        XCTAssertEqual(info.country, .unitedStates)
         XCTAssertEqual(info.taxType, .cpf)
         XCTAssertEqual(info.tax, "85323EC0-A9114")
         XCTAssertEqual(info.birthdate, "2018-09-20")
         XCTAssertEqual(info.email, "email@example.com")
-        try XCTAssertEqual(info.billing, Address(
-            recipientName: nil, defaultAddress: nil, line1: "Plum Fairy Ln.", line2: nil, city: "Ginger Planes", state: "CC",
-            countryCode: "PU", postalCode: "3552", phone: nil, type: nil
+        XCTAssertEqual(info.billing, Address(
+            recipientName: nil, defaultAddress: nil, line1: "Plum Fairy Ln.", line2: nil, city: "Ginger Planes", state: .le,
+            country: .wallisFutuna, postalCode: "3552", phone: nil, type: nil
         ))
     }
     
diff --git a/Tests/PayPalTests/ModelTests/OrderPaymentTests.swift b/Tests/PayPalTests/ModelTests/OrderPaymentTests.swift
index 9c3748a2..4637e90a 100644
--- a/Tests/PayPalTests/ModelTests/OrderPaymentTests.swift
+++ b/Tests/PayPalTests/ModelTests/OrderPaymentTests.swift
@@ -3,17 +3,17 @@ import XCTest
 
 final class OrderPaymentTests: XCTestCase {
     func testInit()throws {
-        let payment = try Order.Payment(
+        let payment = Order.Payment(
             captures: [Capture(amount: nil, transaction: nil)],
             refunds: [Refund(amount: nil)],
-            sales: [Sale(amount: nil, transaction: Amount(currency: .usd, value: "1.00"))],
-            authorizations: [Sale(amount: nil, transaction: Amount(currency: .usd, value: "2.00"))]
+            sales: [Sale(amount: nil, transaction: CurrencyAmount(currency: .usd, value: 1.00))],
+            authorizations: [Sale(amount: nil, transaction: CurrencyAmount(currency: .usd, value: 2.00))]
         )
         
         XCTAssertEqual(payment.captures, [Capture(amount: nil, transaction: nil)])
         XCTAssertEqual(payment.refunds, [Refund(amount: nil)])
-        try XCTAssertEqual(payment.sales, [Sale(amount: nil, transaction: Amount(currency: .usd, value: "1.00"))])
-        try XCTAssertEqual(payment.authorizations, [Sale(amount: nil, transaction: Amount(currency: .usd, value: "2.00"))])
+        XCTAssertEqual(payment.sales, [Sale(amount: nil, transaction: CurrencyAmount(currency: .usd, value: 1.00))])
+        XCTAssertEqual(payment.authorizations, [Sale(amount: nil, transaction: CurrencyAmount(currency: .usd, value: 2.00))])
     }
     
     func testEncoding()throws {
diff --git a/Tests/PayPalTests/ModelTests/OrderTests.swift b/Tests/PayPalTests/ModelTests/OrderTests.swift
index 4ab45c8a..bd9784f0 100644
--- a/Tests/PayPalTests/ModelTests/OrderTests.swift
+++ b/Tests/PayPalTests/ModelTests/OrderTests.swift
@@ -7,7 +7,7 @@ final class OrderTests: XCTestCase {
             intent: .sale,
             units: [],
             payment: Order.Payment(captures: nil, refunds: nil, sales: nil, authorizations: nil),
-            total: Amount(currency: .usd, value: "150.78"),
+            total: CurrencyAmount(currency: .usd, value: 150.78),
             context: AppContext(),
             metadata: Order.Metadata(data: [:]),
             redirects: Redirects(return: "https://example.com/approved", cancel: "https://example.com/canceled")
@@ -18,7 +18,7 @@ final class OrderTests: XCTestCase {
         XCTAssertEqual(order.payment, Order.Payment(captures: nil, refunds: nil, sales: nil, authorizations: nil))
         XCTAssertEqual(order.metadata, Order.Metadata(data: [:]))
         XCTAssertEqual(order.redirects, Redirects(return: "https://example.com/approved", cancel: "https://example.com/canceled"))
-        try XCTAssertEqual(order.total, Amount(currency: .usd, value: "150.78"))
+        XCTAssertEqual(order.total, CurrencyAmount(currency: .usd, value: 150.78))
         try XCTAssertEqual(order.context, AppContext())
     }
     
@@ -28,7 +28,7 @@ final class OrderTests: XCTestCase {
             intent: .sale,
             units: [],
             payment: Order.Payment(captures: nil, refunds: nil, sales: nil, authorizations: nil),
-            total: Amount(currency: .usd, value: "150.78"),
+            total: CurrencyAmount(currency: .usd, value: 150.78),
             context: AppContext(),
             metadata: Order.Metadata(data: [:]),
             redirects: Redirects(return: nil, cancel: nil)
@@ -83,7 +83,7 @@ final class OrderTests: XCTestCase {
         XCTAssertEqual(order.created, "2018-09-20T13:17:47+0000")
         XCTAssertEqual(order.updated, "2018-09-20T13:18:03+0000")
         XCTAssertEqual(order.links, [])
-        try XCTAssertEqual(order.total, Amount(currency: .usd, value: "150.78"))
+        XCTAssertEqual(order.total, CurrencyAmount(currency: .usd, value: 150.78))
         try XCTAssertEqual(order.context, AppContext())
     }
     
diff --git a/Tests/PayPalTests/ModelTests/OrderUnitTests.swift b/Tests/PayPalTests/ModelTests/OrderUnitTests.swift
index dcd5ff4b..edb802e3 100644
--- a/Tests/PayPalTests/ModelTests/OrderUnitTests.swift
+++ b/Tests/PayPalTests/ModelTests/OrderUnitTests.swift
@@ -4,21 +4,21 @@ import XCTest
 final class OrderUnitTests: XCTestCase {
     func testInit()throws {
         let payee = Payee(email: "payee@example.com", merchant: "AEDCA9E0-5442-41EF-978A-DEE6DF7DFDA8", metadata: nil)
-        let address = try Address(
+        let address = Address(
             recipientName: nil,
             defaultAddress: nil,
             line1: "1 Infinate Loop",
             line2: nil,
             city: "Cupertino",
-            state: "CA",
-            countryCode: "US",
+            state: .ca,
+            country: .unitedStates,
             postalCode: "94024",
             phone: nil,
             type: nil
         )
         let unit = try Order.Unit(
             reference: "C1C099F2-D7E7-4E19-BBBF-98DD11EA911A",
-            amount: DetailedAmount(currency: .usd, total: "5.00", details: nil),
+            amount: DetailedAmount(currency: .usd, total: 5.00, details: nil),
             payee: payee,
             description: "Descript",
             invoice: "B5382984-3B90-4BC4-9F7A-6A6AFA61AC25",
@@ -28,7 +28,7 @@ final class OrderUnitTests: XCTestCase {
             notify: "https://example.com/notify",
             shippingAddress: address,
             shippingMethod: "USPSParcel",
-            partnerFee: PartnerFee(receiver: payee, amount: Amount(currency: .usd, value: "2.50")),
+            partnerFee: PartnerFee(receiver: payee, amount: CurrencyAmount(currency: .usd, value: 2.50)),
             paymentGroup: 1,
             metadata: .init(data: ["name": "value"]),
             payment: .init(captures: nil, refunds: nil, sales: nil, authorizations: nil)
@@ -47,49 +47,49 @@ final class OrderUnitTests: XCTestCase {
         XCTAssertEqual(unit.paymentGroup, 1)
         XCTAssertEqual(unit.metadata, .init(data: ["name": "value"]))
         XCTAssertEqual(unit.payment, .init(captures: nil, refunds: nil, sales: nil, authorizations: nil))
-        try XCTAssertEqual(unit.partnerFee, PartnerFee(receiver: payee, amount: Amount(currency: .usd, value: "2.50")))
-        try XCTAssertEqual(unit.amount, DetailedAmount(currency: .usd, total: "5.00", details: nil))
+        XCTAssertEqual(unit.partnerFee, PartnerFee(receiver: payee, amount: CurrencyAmount(currency: .usd, value: 2.50)))
+        XCTAssertEqual(unit.amount, DetailedAmount(currency: .usd, total: 5.00, details: nil))
     }
     
     func testValidations()throws {
         try XCTAssertThrowsError(Order.Unit(
-            reference: String(repeating: "r", count: 257), amount: DetailedAmount(currency: .usd, total: "5.00", details: nil), payee: nil,
+            reference: String(repeating: "r", count: 257), amount: DetailedAmount(currency: .usd, total: 5.00, details: nil), payee: nil,
             description: nil, invoice: nil, custom: nil, paymentDescriptor: nil, items: [], notify: nil, shippingAddress: nil, shippingMethod: nil,
             partnerFee: nil, paymentGroup: nil, metadata: nil, payment: nil
         ))
         try XCTAssertThrowsError(Order.Unit(
-            reference: "C1C099F2-D7E7-4E19-BBBF-98DD11EA911A", amount: DetailedAmount(currency: .usd, total: "5.00", details: nil), payee: nil,
+            reference: "C1C099F2-D7E7-4E19-BBBF-98DD11EA911A", amount: DetailedAmount(currency: .usd, total: 5.00, details: nil), payee: nil,
             description: String(repeating: "d", count: 128), invoice: nil, custom: nil, paymentDescriptor: nil,items: [], notify: nil, shippingAddress: nil,
             shippingMethod: nil, partnerFee: nil, paymentGroup: nil, metadata: nil, payment: nil
         ))
         try XCTAssertThrowsError(Order.Unit(
-            reference: "C1C099F2-D7E7-4E19-BBBF-98DD11EA911A", amount: DetailedAmount(currency: .usd, total: "5.00", details: nil), payee: nil, description: nil,
+            reference: "C1C099F2-D7E7-4E19-BBBF-98DD11EA911A", amount: DetailedAmount(currency: .usd, total: 5.00, details: nil), payee: nil, description: nil,
             invoice: nil, custom: String(repeating: "c", count: 128), paymentDescriptor: nil, items: [], notify: nil, shippingAddress: nil, shippingMethod: nil,
             partnerFee: nil, paymentGroup: nil, metadata: nil, payment: nil
         ))
         try XCTAssertThrowsError(Order.Unit(
-            reference: "C1C099F2-D7E7-4E19-BBBF-98DD11EA911A", amount: DetailedAmount(currency: .usd, total: "5.00", details: nil), payee: nil, description: nil,
+            reference: "C1C099F2-D7E7-4E19-BBBF-98DD11EA911A", amount: DetailedAmount(currency: .usd, total: 5.00, details: nil), payee: nil, description: nil,
             invoice: String(repeating: "i", count: 257), custom: nil, paymentDescriptor: nil, items: [], notify: nil, shippingAddress: nil, shippingMethod: nil,
             partnerFee: nil, paymentGroup: nil, metadata: nil, payment: nil
         ))
         try XCTAssertThrowsError(Order.Unit(
-            reference: "C1C099F2-D7E7-4E19-BBBF-98DD11EA911A", amount: DetailedAmount(currency: .usd, total: "5.00", details: nil), payee: nil, description: nil,
+            reference: "C1C099F2-D7E7-4E19-BBBF-98DD11EA911A", amount: DetailedAmount(currency: .usd, total: 5.00, details: nil), payee: nil, description: nil,
             invoice: nil, custom: nil, paymentDescriptor: String(repeating: "p", count: 23), items: [], notify: nil, shippingAddress: nil, shippingMethod: nil,
             partnerFee: nil, paymentGroup: nil, metadata: nil, payment: nil
         ))
         try XCTAssertThrowsError(Order.Unit(
-            reference: "C1C099F2-D7E7-4E19-BBBF-98DD11EA911A", amount: DetailedAmount(currency: .usd, total: "5.00", details: nil), payee: nil, description: nil,
+            reference: "C1C099F2-D7E7-4E19-BBBF-98DD11EA911A", amount: DetailedAmount(currency: .usd, total: 5.00, details: nil), payee: nil, description: nil,
             invoice: nil, custom: nil, paymentDescriptor: nil, items: [], notify: String(repeating: "n", count: 2049), shippingAddress: nil, shippingMethod: nil,
             partnerFee: nil, paymentGroup: nil, metadata: nil, payment: nil
         ))
         try XCTAssertThrowsError(Order.Unit(
-            reference: "C1C099F2-D7E7-4E19-BBBF-98DD11EA911A", amount: DetailedAmount(currency: .usd, total: "5.00", details: nil), payee: nil, description: nil,
+            reference: "C1C099F2-D7E7-4E19-BBBF-98DD11EA911A", amount: DetailedAmount(currency: .usd, total: 5.00, details: nil), payee: nil, description: nil,
             invoice: nil, custom: nil, paymentDescriptor: nil, items: [], notify: nil, shippingAddress: nil, shippingMethod: nil, partnerFee: nil,
             paymentGroup: 101, metadata: nil, payment: nil
         ))
         var unit = try Order.Unit(
             reference: "C1C099F2-D7E7-4E19-BBBF-98DD11EA911A",
-            amount: DetailedAmount(currency: .usd, total: "5.00", details: nil),
+            amount: DetailedAmount(currency: .usd, total: 5.00, details: nil),
             payee: nil,
             description: "Descript",
             invoice: "B5382984-3B90-4BC4-9F7A-6A6AFA61AC25",
@@ -132,21 +132,21 @@ final class OrderUnitTests: XCTestCase {
     func testEncoding()throws {
         let encoder = JSONEncoder()
         let payee = Payee(email: nil, merchant: nil, metadata: nil)
-        let address = try Address(
+        let address = Address(
             recipientName: nil,
             defaultAddress: nil,
             line1: "1 Infinate Loop",
             line2: nil,
             city: "Cupertino",
             state: nil,
-            countryCode: "US",
+            country: .unitedStates,
             postalCode: "94024",
             phone: nil,
             type: nil
         )
         let unit = try Order.Unit(
             reference: "C1C099F2-D7E7-4E19-BBBF-98DD11EA911A",
-            amount: DetailedAmount(currency: .usd, total: "5.00", details: nil),
+            amount: DetailedAmount(currency: .usd, total: 5.00, details: nil),
             payee: payee,
             description: "Descript",
             invoice: "B5382984-3B90-4BC4-9F7A-6A6AFA61AC25",
@@ -156,7 +156,7 @@ final class OrderUnitTests: XCTestCase {
             notify: "https://example.com/notify",
             shippingAddress: address,
             shippingMethod: "USPSParcel",
-            partnerFee: PartnerFee(receiver: payee, amount: Amount(currency: .usd, value: "2.50")),
+            partnerFee: PartnerFee(receiver: payee, amount: CurrencyAmount(currency: .usd, value: 2.50)),
             paymentGroup: 1,
             metadata: .init(data: [:]),
             payment: .init(captures: nil, refunds: nil, sales: nil, authorizations: nil)
@@ -184,14 +184,14 @@ final class OrderUnitTests: XCTestCase {
     func testDecoding()throws {
         let decoder = JSONDecoder()
         let payee = Payee(email: nil, merchant: nil, metadata: nil)
-        let address = try Address(
+        let address = Address(
             recipientName: nil,
             defaultAddress: nil,
             line1: "1 Infinate Loop",
             line2: nil,
             city: "Cupertino",
             state: nil,
-            countryCode: "US",
+            country: .unitedStates,
             postalCode: "94024",
             phone: nil,
             type: nil
@@ -252,8 +252,8 @@ final class OrderUnitTests: XCTestCase {
         XCTAssertEqual(unit.paymentGroup, 1)
         XCTAssertEqual(unit.metadata, .init(data: [:]))
         XCTAssertEqual(unit.payment, .init(captures: nil, refunds: nil, sales: nil, authorizations: nil))
-        try XCTAssertEqual(unit.partnerFee, PartnerFee(receiver: payee, amount: Amount(currency: .usd, value: "2.50")))
-        try XCTAssertEqual(unit.amount, DetailedAmount(currency: .usd, total: "5.00", details: nil))
+        XCTAssertEqual(unit.partnerFee, PartnerFee(receiver: payee, amount: CurrencyAmount(currency: .usd, value: 2.50)))
+        XCTAssertEqual(unit.amount, DetailedAmount(currency: .usd, total: 5.00, details: nil))
         
     }
     
diff --git a/Tests/PayPalTests/ModelTests/OverrideChargeTests.swift b/Tests/PayPalTests/ModelTests/OverrideChargeTests.swift
index 2b822d8b..5cbcbab4 100644
--- a/Tests/PayPalTests/ModelTests/OverrideChargeTests.swift
+++ b/Tests/PayPalTests/ModelTests/OverrideChargeTests.swift
@@ -4,10 +4,10 @@ import XCTest
 final class OverrideChargeTests: XCTestCase {
     func testInit()throws {
         let id = UUID().uuidString
-        let charge = try OverrideCharge(id: id, amount: Money(currency: .usd, value: "314.15"))
+        let charge = OverrideCharge(id: id, amount: CurrencyCodeAmount(currency: .usd, value: 314.15))
         
         XCTAssertEqual(charge.id, id)
-        try XCTAssertEqual(charge.amount, Money(currency: .usd, value: "314.15"))
+        XCTAssertEqual(charge.amount, CurrencyCodeAmount(currency: .usd, value: 314.15))
     }
     
     func testEncoding()throws {
@@ -16,10 +16,10 @@ final class OverrideChargeTests: XCTestCase {
         let randID = UUID().uuidString
         
         let constant = try String(data: encoder.encode(
-           OverrideCharge(id: uuid, amount: Money(currency: .eur, value: "13.54"))
+           OverrideCharge(id: uuid, amount: CurrencyCodeAmount(currency: .eur, value: 13.54))
         ), encoding: .utf8)
         let variable = try String(data: encoder.encode(
-            OverrideCharge(id: randID, amount: Money(currency: .ang, value: "45.31"))
+            OverrideCharge(id: randID, amount: CurrencyCodeAmount(currency: .ang, value: 45.31))
         ), encoding: .utf8)
         
         XCTAssertEqual(constant, "{\"id\":\"94F7A65B-ACEF-45AA-BA01-F141FAF40986\",\"amount\":{\"value\":\"13.54\",\"currency_code\":\"EUR\"}}")
@@ -49,9 +49,9 @@ final class OverrideChargeTests: XCTestCase {
         }
         """.data(using: .utf8)!
         
-        try XCTAssertEqual(OverrideCharge(id: randID, amount: Money(currency: .ang, value: "45.31")), decoder.decode(OverrideCharge.self, from: variable))
+        try XCTAssertEqual(OverrideCharge(id: randID, amount: CurrencyCodeAmount(currency: .ang, value: 45.31)), decoder.decode(OverrideCharge.self, from: variable))
         try XCTAssertEqual(
-            OverrideCharge(id: "94F7A65B-ACEF-45AA-BA01-F141FAF40986", amount: Money(currency: .eur, value: "13.54")),
+            OverrideCharge(id: "94F7A65B-ACEF-45AA-BA01-F141FAF40986", amount: CurrencyCodeAmount(currency: .eur, value: 13.54)),
             decoder.decode(OverrideCharge.self, from: constant)
         )
     }
diff --git a/Tests/PayPalTests/ModelTests/PartnerFeeTests.swift b/Tests/PayPalTests/ModelTests/PartnerFeeTests.swift
index b91746e4..2981ae04 100644
--- a/Tests/PayPalTests/ModelTests/PartnerFeeTests.swift
+++ b/Tests/PayPalTests/ModelTests/PartnerFeeTests.swift
@@ -3,7 +3,7 @@ import XCTest
 
 final class PartnerFeeTests: XCTestCase {
     func testInit()throws {
-        let amount = try Amount(currency: .usd, value: "54.96")
+        let amount = CurrencyAmount(currency: .usd, value: 54.96)
         let payee = Payee(email: nil, merchant: nil, metadata: nil)
         let fee = PartnerFee(receiver: payee, amount: amount)
         
@@ -13,9 +13,9 @@ final class PartnerFeeTests: XCTestCase {
     
     func testEncoding()throws {
         let encoder = JSONEncoder()
-        let fee = try PartnerFee(
+        let fee = PartnerFee(
             receiver: Payee(email: nil, merchant: nil, metadata: nil),
-            amount: Amount(currency: .usd, value: "54.96")
+            amount: CurrencyAmount(currency: .usd, value: 54.96)
         )
         let generated = try String(data: encoder.encode(fee), encoding: .utf8)
         
@@ -34,9 +34,9 @@ final class PartnerFeeTests: XCTestCase {
         }
         """.data(using: .utf8)!
         
-        let fee = try PartnerFee(
+        let fee = PartnerFee(
             receiver: Payee(email: nil, merchant: nil, metadata: nil),
-            amount: Amount(currency: .usd, value: "54.96")
+            amount: CurrencyAmount(currency: .usd, value: 54.96)
         )
         try XCTAssertEqual(fee, decoder.decode(PartnerFee.self, from: json))
     }
diff --git a/Tests/PayPalTests/ModelTests/PayeeMetadataTests.swift b/Tests/PayPalTests/ModelTests/PayeeMetadataTests.swift
index dd4a647e..cbdd00c4 100644
--- a/Tests/PayPalTests/ModelTests/PayeeMetadataTests.swift
+++ b/Tests/PayPalTests/ModelTests/PayeeMetadataTests.swift
@@ -3,20 +3,28 @@ import XCTest
 
 final class PayeeMetadataTests: XCTestCase {
     func testInit()throws {
-        let metadata = try Payee.Metadata(email: "payee@example.com", phone: DisplayPhone(country: "US", number: "423981155636432"), brand: "Example Inc.")
+        let metadata = try Payee.Metadata(
+            email: "payee@example.com",
+            phone: DisplayPhone(country: .unitedStates, number: "423981155636432"),
+            brand: "Example Inc."
+        )
         
         XCTAssertEqual(metadata.email, "payee@example.com")
         XCTAssertEqual(metadata.brand, "Example Inc.")
-        try XCTAssertEqual(metadata.phone, DisplayPhone(country: "US", number: "423981155636432"))
+        XCTAssertEqual(metadata.phone, DisplayPhone(country: .unitedStates, number: "423981155636432"))
     }
     
     func testValidations()throws {
         try XCTAssertThrowsError(Payee.Metadata(
             email: String(repeating: "e", count: 128),
-            phone: DisplayPhone(country: "US", number: "423981155636432"),
+            phone: DisplayPhone(country: .unitedStates, number: "423981155636432"),
             brand: "Example Inc."
         ))
-        var metadata = try Payee.Metadata(email: "payee@example.com", phone: DisplayPhone(country: "US", number: "423981155636432"), brand: "Example Inc.")
+        var metadata = try Payee.Metadata(
+            email: "payee@example.com",
+            phone: DisplayPhone(country: .unitedStates, number: "423981155636432"),
+            brand: "Example Inc."
+        )
         
         try XCTAssertThrowsError(metadata.set(\Payee.Metadata.email <~ String(repeating: "e", count: 128)))
         try metadata.set(\Payee.Metadata.email <~ String(repeating: "e", count: 127))
@@ -26,7 +34,11 @@ final class PayeeMetadataTests: XCTestCase {
     
     func testEncoding()throws {
         let encoder = JSONEncoder()
-        let metadata = try Payee.Metadata(email: "payee@example.com", phone: DisplayPhone(country: "US", number: "423981155636432"), brand: "Example Inc.")
+        let metadata = try Payee.Metadata(
+            email: "payee@example.com",
+            phone: DisplayPhone(country: .unitedStates, number: "423981155636432"),
+            brand: "Example Inc."
+        )
         let generated = try String(data: encoder.encode(metadata), encoding: .utf8)!
         let json = "{\"email\":\"payee@example.com\",\"brand_name\":\"Example Inc.\",\"display_phone\":{\"country_code\":\"US\",\"number\":\"423981155636432\"}}"
         
@@ -52,7 +64,11 @@ final class PayeeMetadataTests: XCTestCase {
             "email": "payee@example.com"
         }
         """.data(using: .utf8)!
-        let metadata = try Payee.Metadata(email: "payee@example.com", phone: DisplayPhone(country: "US", number: "423981155636432"), brand: "Example Inc.")
+        let metadata = try Payee.Metadata(
+            email: "payee@example.com",
+            phone: DisplayPhone(country: .unitedStates, number: "423981155636432"),
+            brand: "Example Inc."
+        )
         
         try XCTAssertEqual(metadata, decoder.decode(Payee.Metadata.self, from: json))
     }
diff --git a/Tests/PayPalTests/ModelTests/PayeeTests.swift b/Tests/PayPalTests/ModelTests/PayeeTests.swift
index 7162f7bb..dce72851 100644
--- a/Tests/PayPalTests/ModelTests/PayeeTests.swift
+++ b/Tests/PayPalTests/ModelTests/PayeeTests.swift
@@ -3,7 +3,11 @@ import XCTest
 
 final class PayeeTests: XCTestCase {
     func testInit()throws {
-        let metadata = try Payee.Metadata(email: "payee@example.com", phone: DisplayPhone(country: "US", number: "423981155636432"), brand: "Example Inc.")
+        let metadata = try Payee.Metadata(
+            email: "payee@example.com",
+            phone: DisplayPhone(country: .unitedStates, number: "423981155636432"),
+            brand: "Example Inc."
+        )
         let payee = Payee(email: "payee@example.com", merchant: "4B4E8CB5-A0A3-47C0-B53E-6CF99BAA59EE", metadata: metadata)
         
         XCTAssertEqual(payee.email, "payee@example.com")
@@ -13,7 +17,11 @@ final class PayeeTests: XCTestCase {
     
     func testEncoding()throws {
         let encoder = JSONEncoder()
-        let metadata = try Payee.Metadata(email: "payee@example.com", phone: DisplayPhone(country: "US", number: "423981155636432"), brand: "Example Inc.")
+        let metadata = try Payee.Metadata(
+            email: "payee@example.com",
+            phone: DisplayPhone(country: .unitedStates, number: "423981155636432"),
+            brand: "Example Inc."
+        )
         let generated = try String(data: encoder.encode(metadata), encoding: .utf8)!
         let json = "{\"email\":\"payee@example.com\",\"brand_name\":\"Example Inc.\",\"display_phone\":{\"country_code\":\"US\",\"number\":\"423981155636432\"}}"
         
@@ -39,7 +47,11 @@ final class PayeeTests: XCTestCase {
             "email": "payee@example.com"
         }
         """.data(using: .utf8)!
-        let metadata = try Payee.Metadata(email: "payee@example.com", phone: DisplayPhone(country: "US", number: "423981155636432"), brand: "Example Inc.")
+        let metadata = try Payee.Metadata(
+            email: "payee@example.com",
+            phone: DisplayPhone(country: .unitedStates, number: "423981155636432"),
+            brand: "Example Inc."
+        )
         
         try XCTAssertEqual(metadata, decoder.decode(Payee.Metadata.self, from: json))
     }
diff --git a/Tests/PayPalTests/ModelTests/PayerInfoTests.swift b/Tests/PayPalTests/ModelTests/PayerInfoTests.swift
index cb7dd963..dac9b26e 100644
--- a/Tests/PayPalTests/ModelTests/PayerInfoTests.swift
+++ b/Tests/PayPalTests/ModelTests/PayerInfoTests.swift
@@ -3,7 +3,7 @@ import XCTest
 
 final class PayerInfoTests: XCTestCase {
     func testInit()throws {
-        let info = try PayerInfo(
+        let info = PayerInfo(
             email: "payer@exmaple.com",
             shippingAddress: nil,
             billingAddress: Address(
@@ -12,8 +12,8 @@ final class PayerInfoTests: XCTestCase {
                 line1: "89 Furnace Dr.",
                 line2: nil,
                 city: "Nowhere",
-                state: "KS",
-                countryCode: "US",
+                state: .ks,
+                country: .unitedStates,
                 postalCode: "66167",
                 phone: nil,
                 type: nil
@@ -26,7 +26,7 @@ final class PayerInfoTests: XCTestCase {
         
         XCTAssertEqual(info.email, "payer@exmaple.com")
         XCTAssertEqual(info.shippingAddress, nil)
-        try XCTAssertEqual(
+        XCTAssertEqual(
             info.billingAddress,
             Address(
                 recipientName: "Puffin Billy",
@@ -34,8 +34,8 @@ final class PayerInfoTests: XCTestCase {
                 line1: "89 Furnace Dr.",
                 line2: nil,
                 city: "Nowhere",
-                state: "KS",
-                countryCode: "US",
+                state: .ks,
+                country: .unitedStates,
                 postalCode: "66167",
                 phone: nil,
                 type: nil
@@ -45,7 +45,7 @@ final class PayerInfoTests: XCTestCase {
     
     func testEncoding()throws {
         let encoder = JSONEncoder()
-        let info = try PayerInfo(
+        let info = PayerInfo(
             email: "payer@exmaple.com",
             shippingAddress: nil,
             billingAddress: Address(
@@ -54,8 +54,8 @@ final class PayerInfoTests: XCTestCase {
                 line1: "89 Furnace Dr.",
                 line2: nil,
                 city: "Nowhere",
-                state: "KS",
-                countryCode: "US",
+                state: .ks,
+                country: .unitedStates,
                 postalCode: "66167",
                 phone: nil,
                 type: nil
@@ -78,7 +78,7 @@ final class PayerInfoTests: XCTestCase {
     
     func testDecoding()throws {
         let decoder = JSONDecoder()
-        let info = try PayerInfo(
+        let info = PayerInfo(
             email: "payer@exmaple.com",
             shippingAddress: nil,
             billingAddress: Address(
@@ -87,8 +87,8 @@ final class PayerInfoTests: XCTestCase {
                 line1: "89 Furnace Dr.",
                 line2: nil,
                 city: "Nowhere",
-                state: "KS",
-                countryCode: "US",
+                state: .ks,
+                country: .unitedStates,
                 postalCode: "66167",
                 phone: nil,
                 type: nil
diff --git a/Tests/PayPalTests/ModelTests/PayerTests.swift b/Tests/PayPalTests/ModelTests/PayerTests.swift
index f78611ab..0726c986 100644
--- a/Tests/PayPalTests/ModelTests/PayerTests.swift
+++ b/Tests/PayPalTests/ModelTests/PayerTests.swift
@@ -27,8 +27,8 @@ final class PayerTests: XCTestCase {
                     line1: "89 Furnace Dr.",
                     line2: nil,
                     city: "Nowhere",
-                    state: "KS",
-                    countryCode: "US",
+                    state: .ks,
+                    country: .unitedStates,
                     postalCode: "66167",
                     phone: nil,
                     type: nil
@@ -53,7 +53,7 @@ final class PayerTests: XCTestCase {
                 customerID: "5FC894A2-FDA7-416D-818F-C0678C57371F"
             )
         )
-        try XCTAssertEqual(
+        XCTAssertEqual(
             payer.info,
             PayerInfo(
                 email: "payer@exmaple.com",
@@ -64,8 +64,8 @@ final class PayerTests: XCTestCase {
                     line1: "89 Furnace Dr.",
                     line2: nil,
                     city: "Nowhere",
-                    state: "KS",
-                    countryCode: "US",
+                    state: .ks,
+                    country: .unitedStates,
                     postalCode: "66167",
                     phone: nil,
                     type: nil
@@ -100,8 +100,8 @@ final class PayerTests: XCTestCase {
                     line1: "89 Furnace Dr.",
                     line2: nil,
                     city: "Nowhere",
-                    state: "KS",
-                    countryCode: "US",
+                    state: .ks,
+                    country: .unitedStates,
                     postalCode: "66167",
                     phone: nil,
                     type: nil
@@ -152,8 +152,8 @@ final class PayerTests: XCTestCase {
                     line1: "89 Furnace Dr.",
                     line2: nil,
                     city: "Nowhere",
-                    state: "KS",
-                    countryCode: "US",
+                    state: .ks,
+                    country: .unitedStates,
                     postalCode: "66167",
                     phone: nil,
                     type: nil
diff --git a/Tests/PayPalTests/ModelTests/PaymentDetailTests.swift b/Tests/PayPalTests/ModelTests/PaymentDetailTests.swift
index cd992a07..6193c19b 100644
--- a/Tests/PayPalTests/ModelTests/PaymentDetailTests.swift
+++ b/Tests/PayPalTests/ModelTests/PaymentDetailTests.swift
@@ -5,17 +5,17 @@ final class PaymentDetailTests: XCTestCase {
     let now = Date().iso8601
     
     func testInit()throws {
-        let detail = try PaymentDetail(date: self.now, method: .cash, note: "Hello World", amount: Amount(currency: .usd, value: "4.50"))
+        let detail = PaymentDetail(date: self.now, method: .cash, note: "Hello World", amount: CurrencyAmount(currency: .usd, value: 4.50))
         
         XCTAssertEqual(detail.date, self.now)
         XCTAssertEqual(detail.method, .cash)
         XCTAssertEqual(detail.note, "Hello World")
-        try XCTAssertEqual(detail.amount, Amount(currency: .usd, value: "4.50"))
+        XCTAssertEqual(detail.amount, CurrencyAmount(currency: .usd, value: 4.50))
     }
     
     func testEncoding()throws {
         let encoder = JSONEncoder()
-        let detail = try PaymentDetail(date: self.now, method: .cash, note: "Hello World", amount: Amount(currency: .usd, value: "4.50"))
+        let detail = PaymentDetail(date: self.now, method: .cash, note: "Hello World", amount: CurrencyAmount(currency: .usd, value: 4.50))
         let generated = try String(data: encoder.encode(detail), encoding: .utf8)!
         let json = "{\"amount\":{\"value\":\"4.50\",\"currency\":\"USD\"},\"method\":\"CASH\",\"note\":\"Hello World\",\"date\":\"\(self.now)\"}"
         
@@ -31,7 +31,7 @@ final class PaymentDetailTests: XCTestCase {
     
     func testDecoding()throws {
         let decoder = JSONDecoder()
-        let detail = try PaymentDetail(date: self.now, method: .cash, note: "Hello World", amount: Amount(currency: .usd, value: "4.50"))
+        let detail = PaymentDetail(date: self.now, method: .cash, note: "Hello World", amount: CurrencyAmount(currency: .usd, value: 4.50))
         let json = """
         {
             "amount": {
diff --git a/Tests/PayPalTests/ModelTests/PaymentExecutorTests.swift b/Tests/PayPalTests/ModelTests/PaymentExecutorTests.swift
index e3bd867c..c360ef44 100644
--- a/Tests/PayPalTests/ModelTests/PaymentExecutorTests.swift
+++ b/Tests/PayPalTests/ModelTests/PaymentExecutorTests.swift
@@ -11,7 +11,7 @@ final class PaymentExecutorTests: XCTestCase {
     
     func testEncoding()throws {
         let encoder = JSONEncoder()
-        let executor = try Payment.Executor(payer: "payer", amounts: [DetailedAmount(currency: .usd, total: "10.00", details: nil)])
+        let executor = Payment.Executor(payer: "payer", amounts: [DetailedAmount(currency: .usd, total: 10.00, details: nil)])
         let generated = try String(data: encoder.encode(executor), encoding: .utf8)!
         let json = "{\"payer_id\":\"payer\",\"transactions\":[{\"amount\":{\"currency\":\"USD\",\"total\":\"10.00\"}}]}"
         
@@ -34,7 +34,7 @@ final class PaymentExecutorTests: XCTestCase {
         }
         """.data(using: .utf8)!
         
-        let executor = try Payment.Executor(payer: "payer", amounts: [DetailedAmount(currency: .usd, total: "10.00", details: nil)])
+        let executor = Payment.Executor(payer: "payer", amounts: [DetailedAmount(currency: .usd, total: 10.00, details: nil)])
         try XCTAssertEqual(executor, decoder.decode(Payment.Executor.self, from: json))
     }
     
diff --git a/Tests/PayPalTests/ModelTests/PaymentItemListTests.swift b/Tests/PayPalTests/ModelTests/PaymentItemListTests.swift
index 15a4aff6..b1719fc0 100644
--- a/Tests/PayPalTests/ModelTests/PaymentItemListTests.swift
+++ b/Tests/PayPalTests/ModelTests/PaymentItemListTests.swift
@@ -2,14 +2,14 @@ import XCTest
 @testable import PayPal
 
 final class PaymentItemListTests: XCTestCase {
-    let address = try! Address(
+    let address = Address(
         recipientName: nil,
         defaultAddress: nil,
         line1: "line",
         line2: nil,
         city: "city",
         state: nil,
-        countryCode: "US",
+        country: .unitedStates,
         postalCode: "1",
         phone: nil,
         type: nil
@@ -20,14 +20,14 @@ final class PaymentItemListTests: XCTestCase {
         
         XCTAssertEqual(list.items, [])
         XCTAssertEqual(list.phoneNumber, "555-555-5555")
-        try XCTAssertEqual(list.address, Address(
+        XCTAssertEqual(list.address, Address(
             recipientName: nil,
             defaultAddress: nil,
             line1: "line",
             line2: nil,
             city: "city",
             state: nil,
-            countryCode: "US",
+            country: .unitedStates,
             postalCode: "1",
             phone: nil,
             type: nil
diff --git a/Tests/PayPalTests/ModelTests/PaymentRefundResultTests.swift b/Tests/PayPalTests/ModelTests/PaymentRefundResultTests.swift
index a422a465..4cd041ad 100644
--- a/Tests/PayPalTests/ModelTests/PaymentRefundResultTests.swift
+++ b/Tests/PayPalTests/ModelTests/PaymentRefundResultTests.swift
@@ -53,10 +53,10 @@ final class PaymentRefundResultTests: XCTestCase {
         XCTAssertEqual(refund.custom, "Dear Payer...")
         XCTAssertEqual(refund.links, [])
         
-        try XCTAssertEqual(refund.amount, DetailedAmount(currency: .usd, total: "2.34", details: nil))
-        try XCTAssertEqual(refund.transactionFee, Amount(currency: .usd, value: "0.06"))
-        try XCTAssertEqual(refund.received, Amount(currency: .usd, value: "2.28"))
-        try XCTAssertEqual(refund.total, Amount(currency: .usd, value: "2.34"))
+        XCTAssertEqual(refund.amount, DetailedAmount(currency: .usd, total: 2.34, details: nil))
+        XCTAssertEqual(refund.transactionFee, CurrencyAmount(currency: .usd, value: 0.06))
+        XCTAssertEqual(refund.received, CurrencyAmount(currency: .usd, value: 2.28))
+        XCTAssertEqual(refund.total, CurrencyAmount(currency: .usd, value: 2.34))
         
         
         try XCTAssertThrowsError(refund.set(\Payment.RefundResult.invoice, to: String(repeating: "i", count: 128)))
diff --git a/Tests/PayPalTests/ModelTests/PaymentRefundTests.swift b/Tests/PayPalTests/ModelTests/PaymentRefundTests.swift
index d9a512df..acc471db 100644
--- a/Tests/PayPalTests/ModelTests/PaymentRefundTests.swift
+++ b/Tests/PayPalTests/ModelTests/PaymentRefundTests.swift
@@ -4,7 +4,7 @@ import XCTest
 final class PaymentRefundTests: XCTestCase {
     func testInit()throws {
         let refund = try Payment.Refund(
-            amount: DetailedAmount(currency: .usd, total: "10.00", details: nil),
+            amount: DetailedAmount(currency: .usd, total: 10.00, details: nil),
             description: "description",
             reason: "reason",
             invoice: "invoice"
@@ -13,7 +13,7 @@ final class PaymentRefundTests: XCTestCase {
         XCTAssertEqual(refund.description, "description")
         XCTAssertEqual(refund.reason, "reason")
         XCTAssertEqual(refund.invoice, "invoice")
-        try XCTAssertEqual(refund.amount, DetailedAmount(currency: .usd, total: "10.00", details: nil))
+        XCTAssertEqual(refund.amount, DetailedAmount(currency: .usd, total: 10.00, details: nil))
     }
     
     func testValidations()throws {
@@ -21,7 +21,7 @@ final class PaymentRefundTests: XCTestCase {
         try XCTAssertThrowsError(Payment.Refund(amount: nil, description: nil, reason: String(repeating: "r", count: 31), invoice: nil))
         try XCTAssertThrowsError(Payment.Refund(amount: nil, description: nil, reason: nil, invoice: String(repeating: "i", count: 128)))
         var refund = try Payment.Refund(
-            amount: DetailedAmount(currency: .usd, total: "10.00", details: nil),
+            amount: DetailedAmount(currency: .usd, total: 10.00, details: nil),
             description: "description",
             reason: "reason",
             invoice: "invoice"
@@ -43,7 +43,7 @@ final class PaymentRefundTests: XCTestCase {
     func testEncoding()throws {
         let encoder = JSONEncoder()
         let refund = try Payment.Refund(
-            amount: DetailedAmount(currency: .usd, total: "10.00", details: nil),
+            amount: DetailedAmount(currency: .usd, total: 10.00, details: nil),
             description: "desc",
             reason: "reas",
             invoice: "inv"
@@ -76,7 +76,7 @@ final class PaymentRefundTests: XCTestCase {
         """.data(using: .utf8)!
        
         let refund = try Payment.Refund(
-            amount: DetailedAmount(currency: .usd, total: "10.00", details: nil),
+            amount: DetailedAmount(currency: .usd, total: 10.00, details: nil),
             description: "desc",
             reason: "reas",
             invoice: "inv"
diff --git a/Tests/PayPalTests/ModelTests/PaymentSummaryTests.swift b/Tests/PayPalTests/ModelTests/PaymentSummaryTests.swift
index 2068131c..894edd86 100644
--- a/Tests/PayPalTests/ModelTests/PaymentSummaryTests.swift
+++ b/Tests/PayPalTests/ModelTests/PaymentSummaryTests.swift
@@ -20,8 +20,8 @@ final class PaymentSummaryTests: XCTestCase {
         
         let summary = try decoder.decode(PaymentSummary.self, from: valid)
         
-        try XCTAssertEqual(summary.paypal, Amount(currency: .usd, value: "35"))
-        try XCTAssertEqual(summary.other, Amount(currency: .usd, value: "8.43"))
+        XCTAssertEqual(summary.paypal, CurrencyAmount(currency: .usd, value: 35))
+        XCTAssertEqual(summary.other, CurrencyAmount(currency: .usd, value: 8.43))
     }
     
     static var allTests: [(String, (PaymentSummaryTests) -> ()throws -> ())] = [
diff --git a/Tests/PayPalTests/ModelTests/PaymentTransactionTests.swift b/Tests/PayPalTests/ModelTests/PaymentTransactionTests.swift
index 2d8b155c..43215fe4 100644
--- a/Tests/PayPalTests/ModelTests/PaymentTransactionTests.swift
+++ b/Tests/PayPalTests/ModelTests/PaymentTransactionTests.swift
@@ -4,7 +4,7 @@ import XCTest
 final class PaymentTransactionTests: XCTestCase {
     func testInit()throws {
         let transaction = try Payment.Transaction(
-            amount: DetailedAmount(currency: .usd, total: "54.56", details: nil),
+            amount: DetailedAmount(currency: .usd, total: 54.56, details: nil),
             payee: .init(email: nil, merchant: nil, metadata: nil),
             description: "Description",
             payeeNote: "noted",
@@ -54,7 +54,7 @@ final class PaymentTransactionTests: XCTestCase {
             softDescriptor: nil, payment: nil, itemList: nil, notify: String(repeating: "n", count: 2049)
         ))
         var transaction = try Payment.Transaction(
-            amount: DetailedAmount(currency: .usd, total: "54.56", details: nil),
+            amount: DetailedAmount(currency: .usd, total: 54.56, details: nil),
             payee: .init(email: nil, merchant: nil, metadata: nil),
             description: "Description",
             payeeNote: "noted",
@@ -92,7 +92,7 @@ final class PaymentTransactionTests: XCTestCase {
     func testEncoding()throws {
         let encoder = JSONEncoder()
         let transaction = try Payment.Transaction(
-            amount: DetailedAmount(currency: .usd, total: "54.56", details: nil),
+            amount: DetailedAmount(currency: .usd, total: 54.56, details: nil),
             payee: .init(email: nil, merchant: nil, metadata: nil),
             description: "Description",
             payeeNote: "noted",
diff --git a/Tests/PayPalTests/ModelTests/ProvinceTests.swift b/Tests/PayPalTests/ModelTests/ProvinceTests.swift
new file mode 100644
index 00000000..6e7060d9
--- /dev/null
+++ b/Tests/PayPalTests/ModelTests/ProvinceTests.swift
@@ -0,0 +1,536 @@
+import XCTest
+@testable import PayPal
+
+final class ProvinceTests: XCTestCase {
+    struct Land: Codable {
+        let prov: Province
+    }
+    
+    func testCaseRawValues() {
+        XCTAssertEqual(Province.ciudadAutónomaDeBuenosAires.rawValue, "CIUDAD AUTÓNOMA DE BUENOS AIRES")
+        XCTAssertEqual(Province.buenosAires.rawValue, "BUENOS AIRES")
+        XCTAssertEqual(Province.catamarca.rawValue, "CATAMARCA")
+        XCTAssertEqual(Province.chaco.rawValue, "CHACO")
+        XCTAssertEqual(Province.chubut.rawValue, "CHUBUT")
+        XCTAssertEqual(Province.corrientes.rawValue, "CORRIENTES")
+        XCTAssertEqual(Province.córdoba.rawValue, "CÓRDOBA")
+        XCTAssertEqual(Province.entreRíos.rawValue, "ENTRE RÍOS")
+        XCTAssertEqual(Province.formosa.rawValue, "FORMOSA")
+        XCTAssertEqual(Province.jujuy.rawValue, "JUJUY")
+        XCTAssertEqual(Province.laPampa.rawValue, "LA PAMPA")
+        XCTAssertEqual(Province.laRioja.rawValue, "LA RIOJA")
+        XCTAssertEqual(Province.mendoza.rawValue, "MENDOZA")
+        XCTAssertEqual(Province.misiones.rawValue, "MISIONES")
+        XCTAssertEqual(Province.neuquén.rawValue, "NEUQUÉN")
+        XCTAssertEqual(Province.ríoNegro.rawValue, "RÍO NEGRO")
+        XCTAssertEqual(Province.salta.rawValue, "SALTA")
+        XCTAssertEqual(Province.sanJuan.rawValue, "SAN JUAN")
+        XCTAssertEqual(Province.sanLuis.rawValue, "SAN LUIS")
+        XCTAssertEqual(Province.santaCruz.rawValue, "SANTA CRUZ")
+        XCTAssertEqual(Province.santaFe.rawValue, "SANTA FE")
+        XCTAssertEqual(Province.santiagoDelEstero.rawValue, "SANTIAGO DEL ESTERO")
+        XCTAssertEqual(Province.tierraDelFuego.rawValue, "TIERRA DEL FUEGO")
+        XCTAssertEqual(Province.tucumán.rawValue, "TUCUMÁN")
+        XCTAssertEqual(Province.ac.rawValue, "AC")
+        XCTAssertEqual(Province.al.rawValue, "AL")
+        XCTAssertEqual(Province.ap.rawValue, "AP")
+        XCTAssertEqual(Province.am.rawValue, "AM")
+        XCTAssertEqual(Province.ba.rawValue, "BA")
+        XCTAssertEqual(Province.ce.rawValue, "CE")
+        XCTAssertEqual(Province.df.rawValue, "DF")
+        XCTAssertEqual(Province.es.rawValue, "ES")
+        XCTAssertEqual(Province.go.rawValue, "GO")
+        XCTAssertEqual(Province.ma.rawValue, "MA")
+        XCTAssertEqual(Province.mt.rawValue, "MT")
+        XCTAssertEqual(Province.ms.rawValue, "MS")
+        XCTAssertEqual(Province.mg.rawValue, "MG")
+        XCTAssertEqual(Province.pr.rawValue, "PR")
+        XCTAssertEqual(Province.pb.rawValue, "PB")
+        XCTAssertEqual(Province.pa.rawValue, "PA")
+        XCTAssertEqual(Province.pe.rawValue, "PE")
+        XCTAssertEqual(Province.pi.rawValue, "PI")
+        XCTAssertEqual(Province.rn.rawValue, "RN")
+        XCTAssertEqual(Province.rs.rawValue, "RS")
+        XCTAssertEqual(Province.rj.rawValue, "RJ")
+        XCTAssertEqual(Province.ro.rawValue, "RO")
+        XCTAssertEqual(Province.rr.rawValue, "RR")
+        XCTAssertEqual(Province.sc.rawValue, "SC")
+        XCTAssertEqual(Province.se.rawValue, "SE")
+        XCTAssertEqual(Province.sp.rawValue, "SP")
+        XCTAssertEqual(Province.to.rawValue, "TO")
+        XCTAssertEqual(Province.ab.rawValue, "AB")
+        XCTAssertEqual(Province.bc.rawValue, "BC")
+        XCTAssertEqual(Province.mb.rawValue, "MB")
+        XCTAssertEqual(Province.nb.rawValue, "NB")
+        XCTAssertEqual(Province.nl.rawValue, "NL")
+        XCTAssertEqual(Province.nt.rawValue, "NT")
+        XCTAssertEqual(Province.ns.rawValue, "NS")
+        XCTAssertEqual(Province.nu.rawValue, "NU")
+        XCTAssertEqual(Province.on.rawValue, "ON")
+        XCTAssertEqual(Province.qc.rawValue, "QC")
+        XCTAssertEqual(Province.sk.rawValue, "SK")
+        XCTAssertEqual(Province.yt.rawValue, "YT")
+        XCTAssertEqual(Province.cnAh.rawValue, "CN-AH")
+        XCTAssertEqual(Province.cnBj.rawValue, "CN-BJ")
+        XCTAssertEqual(Province.cnCq.rawValue, "CN-CQ")
+        XCTAssertEqual(Province.cnFj.rawValue, "CN-FJ")
+        XCTAssertEqual(Province.cnGd.rawValue, "CN-GD")
+        XCTAssertEqual(Province.cnGs.rawValue, "CN-GS")
+        XCTAssertEqual(Province.cnGx.rawValue, "CN-GX")
+        XCTAssertEqual(Province.cnGz.rawValue, "CN-GZ")
+        XCTAssertEqual(Province.cnHa.rawValue, "CN-HA")
+        XCTAssertEqual(Province.cnHb.rawValue, "CN-HB")
+        XCTAssertEqual(Province.cnHe.rawValue, "CN-HE")
+        XCTAssertEqual(Province.cnHi.rawValue, "CN-HI")
+        XCTAssertEqual(Province.cnHk.rawValue, "CN-HK")
+        XCTAssertEqual(Province.cnHl.rawValue, "CN-HL")
+        XCTAssertEqual(Province.cnHn.rawValue, "CN-HN")
+        XCTAssertEqual(Province.cnJl.rawValue, "CN-JL")
+        XCTAssertEqual(Province.cnJs.rawValue, "CN-JS")
+        XCTAssertEqual(Province.cnJx.rawValue, "CN-JX")
+        XCTAssertEqual(Province.cnLn.rawValue, "CN-LN")
+        XCTAssertEqual(Province.cnMo.rawValue, "CN-MO")
+        XCTAssertEqual(Province.cnNm.rawValue, "CN-NM")
+        XCTAssertEqual(Province.cnNx.rawValue, "CN-NX")
+        XCTAssertEqual(Province.cnQh.rawValue, "CN-QH")
+        XCTAssertEqual(Province.cnSc.rawValue, "CN-SC")
+        XCTAssertEqual(Province.cnSd.rawValue, "CN-SD")
+        XCTAssertEqual(Province.cnSh.rawValue, "CN-SH")
+        XCTAssertEqual(Province.cnSn.rawValue, "CN-SN")
+        XCTAssertEqual(Province.cnSx.rawValue, "CN-SX")
+        XCTAssertEqual(Province.cnTj.rawValue, "CN-TJ")
+        XCTAssertEqual(Province.cnTw.rawValue, "CN-TW")
+        XCTAssertEqual(Province.cnXj.rawValue, "CN-XJ")
+        XCTAssertEqual(Province.cnXz.rawValue, "CN-XZ")
+        XCTAssertEqual(Province.cnYn.rawValue, "CN-YN")
+        XCTAssertEqual(Province.cnZj.rawValue, "CN-ZJ")
+        XCTAssertEqual(Province.andamanAndNicobarIslands.rawValue, "Andaman and Nicobar Islands")
+        XCTAssertEqual(Province.andhraPradesh.rawValue, "Andhra Pradesh")
+        XCTAssertEqual(Province.apo.rawValue, "APO")
+        XCTAssertEqual(Province.arunachalPradesh.rawValue, "Arunachal Pradesh")
+        XCTAssertEqual(Province.assam.rawValue, "Assam")
+        XCTAssertEqual(Province.bihar.rawValue, "Bihar")
+        XCTAssertEqual(Province.chandigarh.rawValue, "Chandigarh")
+        XCTAssertEqual(Province.chhattisgarh.rawValue, "Chhattisgarh")
+        XCTAssertEqual(Province.dadraAndNagarHaveli.rawValue, "Dadra and Nagar Haveli")
+        XCTAssertEqual(Province.damanAndDiu.rawValue, "Daman and Diu")
+        XCTAssertEqual(Province.delhiNCT.rawValue, "Delhi (NCT)")
+        XCTAssertEqual(Province.goa.rawValue, "Goa")
+        XCTAssertEqual(Province.gujarat.rawValue, "Gujarat")
+        XCTAssertEqual(Province.haryana.rawValue, "Haryana")
+        XCTAssertEqual(Province.himachalPradesh.rawValue, "Himachal Pradesh")
+        XCTAssertEqual(Province.jammuAndKashmir.rawValue, "Jammu and Kashmir")
+        XCTAssertEqual(Province.jharkhand.rawValue, "Jharkhand")
+        XCTAssertEqual(Province.karnataka.rawValue, "Karnataka")
+        XCTAssertEqual(Province.kerala.rawValue, "Kerala")
+        XCTAssertEqual(Province.lakshadweep.rawValue, "Lakshadweep")
+        XCTAssertEqual(Province.madhyaPradesh.rawValue, "Madhya Pradesh")
+        XCTAssertEqual(Province.maharashtra.rawValue, "Maharashtra")
+        XCTAssertEqual(Province.manipur.rawValue, "Manipur")
+        XCTAssertEqual(Province.meghalaya.rawValue, "Meghalaya")
+        XCTAssertEqual(Province.mizoram.rawValue, "Mizoram")
+        XCTAssertEqual(Province.nagaland.rawValue, "Nagaland")
+        XCTAssertEqual(Province.odisha.rawValue, "Odisha")
+        XCTAssertEqual(Province.puducherry.rawValue, "Puducherry")
+        XCTAssertEqual(Province.punjab.rawValue, "Punjab")
+        XCTAssertEqual(Province.rajasthan.rawValue, "Rajasthan")
+        XCTAssertEqual(Province.sikkim.rawValue, "Sikkim")
+        XCTAssertEqual(Province.tamilNadu.rawValue, "Tamil Nadu")
+        XCTAssertEqual(Province.telangana.rawValue, "Telangana")
+        XCTAssertEqual(Province.tripura.rawValue, "Tripura")
+        XCTAssertEqual(Province.uttarPradesh.rawValue, "Uttar Pradesh")
+        XCTAssertEqual(Province.uttarakhand.rawValue, "Uttarakhand")
+        XCTAssertEqual(Province.westBengal.rawValue, "West Bengal")
+        XCTAssertEqual(Province.idBa.rawValue, "ID-BA")
+        XCTAssertEqual(Province.idBb.rawValue, "ID-BB")
+        XCTAssertEqual(Province.idBt.rawValue, "ID-BT")
+        XCTAssertEqual(Province.idBe.rawValue, "ID-BE")
+        XCTAssertEqual(Province.idYo.rawValue, "ID-YO")
+        XCTAssertEqual(Province.idJk.rawValue, "ID-JK")
+        XCTAssertEqual(Province.idGo.rawValue, "ID-GO")
+        XCTAssertEqual(Province.idJa.rawValue, "ID-JA")
+        XCTAssertEqual(Province.idJb.rawValue, "ID-JB")
+        XCTAssertEqual(Province.idJt.rawValue, "ID-JT")
+        XCTAssertEqual(Province.idJi.rawValue, "ID-JI")
+        XCTAssertEqual(Province.idKb.rawValue, "ID-KB")
+        XCTAssertEqual(Province.idKs.rawValue, "ID-KS")
+        XCTAssertEqual(Province.idKt.rawValue, "ID-KT")
+        XCTAssertEqual(Province.idKi.rawValue, "ID-KI")
+        XCTAssertEqual(Province.idKu.rawValue, "ID-KU")
+        XCTAssertEqual(Province.idKr.rawValue, "ID-KR")
+        XCTAssertEqual(Province.idLa.rawValue, "ID-LA")
+        XCTAssertEqual(Province.idMa.rawValue, "ID-MA")
+        XCTAssertEqual(Province.idMu.rawValue, "ID-MU")
+        XCTAssertEqual(Province.idAc.rawValue, "ID-AC")
+        XCTAssertEqual(Province.idNb.rawValue, "ID-NB")
+        XCTAssertEqual(Province.idNt.rawValue, "ID-NT")
+        XCTAssertEqual(Province.idPa.rawValue, "ID-PA")
+        XCTAssertEqual(Province.idPb.rawValue, "ID-PB")
+        XCTAssertEqual(Province.idRi.rawValue, "ID-RI")
+        XCTAssertEqual(Province.idSr.rawValue, "ID-SR")
+        XCTAssertEqual(Province.idSn.rawValue, "ID-SN")
+        XCTAssertEqual(Province.idSt.rawValue, "ID-ST")
+        XCTAssertEqual(Province.idSg.rawValue, "ID-SG")
+        XCTAssertEqual(Province.idSa.rawValue, "ID-SA")
+        XCTAssertEqual(Province.idSb.rawValue, "ID-SB")
+        XCTAssertEqual(Province.idSs.rawValue, "ID-SS")
+        XCTAssertEqual(Province.idSu.rawValue, "ID-SU")
+        XCTAssertEqual(Province.ag.rawValue, "AG")
+        XCTAssertEqual(Province.an.rawValue, "AN")
+        XCTAssertEqual(Province.ao.rawValue, "AO")
+        XCTAssertEqual(Province.ar.rawValue, "AR")
+        XCTAssertEqual(Province.at.rawValue, "AT")
+        XCTAssertEqual(Province.av.rawValue, "AV")
+        XCTAssertEqual(Province.bt.rawValue, "BT")
+        XCTAssertEqual(Province.bl.rawValue, "BL")
+        XCTAssertEqual(Province.bn.rawValue, "BN")
+        XCTAssertEqual(Province.bg.rawValue, "BG")
+        XCTAssertEqual(Province.bi.rawValue, "BI")
+        XCTAssertEqual(Province.bo.rawValue, "BO")
+        XCTAssertEqual(Province.bz.rawValue, "BZ")
+        XCTAssertEqual(Province.bs.rawValue, "BS")
+        XCTAssertEqual(Province.br.rawValue, "BR")
+        XCTAssertEqual(Province.ca.rawValue, "CA")
+        XCTAssertEqual(Province.cl.rawValue, "CL")
+        XCTAssertEqual(Province.cb.rawValue, "CB")
+        XCTAssertEqual(Province.ci.rawValue, "CI")
+        XCTAssertEqual(Province.ct.rawValue, "CT")
+        XCTAssertEqual(Province.cz.rawValue, "CZ")
+        XCTAssertEqual(Province.ch.rawValue, "CH")
+        XCTAssertEqual(Province.co.rawValue, "CO")
+        XCTAssertEqual(Province.cs.rawValue, "CS")
+        XCTAssertEqual(Province.cr.rawValue, "CR")
+        XCTAssertEqual(Province.kr.rawValue, "KR")
+        XCTAssertEqual(Province.en.rawValue, "EN")
+        XCTAssertEqual(Province.fm.rawValue, "FM")
+        XCTAssertEqual(Province.fe.rawValue, "FE")
+        XCTAssertEqual(Province.fi.rawValue, "FI")
+        XCTAssertEqual(Province.fg.rawValue, "FG")
+        XCTAssertEqual(Province.fc.rawValue, "FC")
+        XCTAssertEqual(Province.fr.rawValue, "FR")
+        XCTAssertEqual(Province.ge.rawValue, "GE")
+        XCTAssertEqual(Province.gr.rawValue, "GR")
+        XCTAssertEqual(Province.im.rawValue, "IM")
+        XCTAssertEqual(Province.`is`.rawValue, "IS")
+        XCTAssertEqual(Province.aq.rawValue, "AQ")
+        XCTAssertEqual(Province.lt.rawValue, "LT")
+        XCTAssertEqual(Province.le.rawValue, "LE")
+        XCTAssertEqual(Province.lc.rawValue, "LC")
+        XCTAssertEqual(Province.li.rawValue, "LI")
+        XCTAssertEqual(Province.lo.rawValue, "LO")
+        XCTAssertEqual(Province.lu.rawValue, "LU")
+        XCTAssertEqual(Province.mc.rawValue, "MC")
+        XCTAssertEqual(Province.mn.rawValue, "MN")
+        XCTAssertEqual(Province.vs.rawValue, "VS")
+        XCTAssertEqual(Province.me.rawValue, "ME")
+        XCTAssertEqual(Province.mi.rawValue, "MI")
+        XCTAssertEqual(Province.mo.rawValue, "MO")
+        XCTAssertEqual(Province.na.rawValue, "NA")
+        XCTAssertEqual(Province.no.rawValue, "NO")
+        XCTAssertEqual(Province.og.rawValue, "OG")
+        XCTAssertEqual(Province.ot.rawValue, "OT")
+        XCTAssertEqual(Province.or.rawValue, "OR")
+        XCTAssertEqual(Province.pd.rawValue, "PD")
+        XCTAssertEqual(Province.pv.rawValue, "PV")
+        XCTAssertEqual(Province.pg.rawValue, "PG")
+        XCTAssertEqual(Province.pu.rawValue, "PU")
+        XCTAssertEqual(Province.pc.rawValue, "PC")
+        XCTAssertEqual(Province.pt.rawValue, "PT")
+        XCTAssertEqual(Province.pn.rawValue, "PN")
+        XCTAssertEqual(Province.pz.rawValue, "PZ")
+        XCTAssertEqual(Province.po.rawValue, "PO")
+        XCTAssertEqual(Province.rg.rawValue, "RG")
+        XCTAssertEqual(Province.ra.rawValue, "RA")
+        XCTAssertEqual(Province.rc.rawValue, "RC")
+        XCTAssertEqual(Province.re.rawValue, "RE")
+        XCTAssertEqual(Province.ri.rawValue, "RI")
+        XCTAssertEqual(Province.rm.rawValue, "RM")
+        XCTAssertEqual(Province.sa.rawValue, "SA")
+        XCTAssertEqual(Province.ss.rawValue, "SS")
+        XCTAssertEqual(Province.sv.rawValue, "SV")
+        XCTAssertEqual(Province.si.rawValue, "SI")
+        XCTAssertEqual(Province.sr.rawValue, "SR")
+        XCTAssertEqual(Province.so.rawValue, "SO")
+        XCTAssertEqual(Province.ta.rawValue, "TA")
+        XCTAssertEqual(Province.te.rawValue, "TE")
+        XCTAssertEqual(Province.tr.rawValue, "TR")
+        XCTAssertEqual(Province.tp.rawValue, "TP")
+        XCTAssertEqual(Province.tn.rawValue, "TN")
+        XCTAssertEqual(Province.tv.rawValue, "TV")
+        XCTAssertEqual(Province.ts.rawValue, "TS")
+        XCTAssertEqual(Province.ud.rawValue, "UD")
+        XCTAssertEqual(Province.va.rawValue, "VA")
+        XCTAssertEqual(Province.ve.rawValue, "VE")
+        XCTAssertEqual(Province.vb.rawValue, "VB")
+        XCTAssertEqual(Province.vc.rawValue, "VC")
+        XCTAssertEqual(Province.vr.rawValue, "VR")
+        XCTAssertEqual(Province.vv.rawValue, "VV")
+        XCTAssertEqual(Province.vi.rawValue, "VI")
+        XCTAssertEqual(Province.vt.rawValue, "VT")
+        XCTAssertEqual(Province.aichiKen.rawValue, "AICHI-KEN")
+        XCTAssertEqual(Province.akitaKen.rawValue, "AKITA-KEN")
+        XCTAssertEqual(Province.aomoriKen.rawValue, "AOMORI-KEN")
+        XCTAssertEqual(Province.chibaKen.rawValue, "CHIBA-KEN")
+        XCTAssertEqual(Province.ehimeKen.rawValue, "EHIME-KEN")
+        XCTAssertEqual(Province.fukuiKen.rawValue, "FUKUI-KEN")
+        XCTAssertEqual(Province.fukuokaKen.rawValue, "FUKUOKA-KEN")
+        XCTAssertEqual(Province.fukushimaKen.rawValue, "FUKUSHIMA-KEN")
+        XCTAssertEqual(Province.gifuKen.rawValue, "GIFU-KEN")
+        XCTAssertEqual(Province.gunmaKen.rawValue, "GUNMA-KEN")
+        XCTAssertEqual(Province.hiroshimaKen.rawValue, "HIROSHIMA-KEN")
+        XCTAssertEqual(Province.hokkaido.rawValue, "HOKKAIDO")
+        XCTAssertEqual(Province.hyogoKen.rawValue, "HYOGO-KEN")
+        XCTAssertEqual(Province.ibarakiKen.rawValue, "IBARAKI-KEN")
+        XCTAssertEqual(Province.ishikawaKen.rawValue, "ISHIKAWA-KEN")
+        XCTAssertEqual(Province.iwateKen.rawValue, "IWATE-KEN")
+        XCTAssertEqual(Province.kagawaKen.rawValue, "KAGAWA-KEN")
+        XCTAssertEqual(Province.kagoshimaKen.rawValue, "KAGOSHIMA-KEN")
+        XCTAssertEqual(Province.kanagawaKen.rawValue, "KANAGAWA-KEN")
+        XCTAssertEqual(Province.kochiKen.rawValue, "KOCHI-KEN")
+        XCTAssertEqual(Province.kumamotoKen.rawValue, "KUMAMOTO-KEN")
+        XCTAssertEqual(Province.kyotoFu.rawValue, "KYOTO-FU")
+        XCTAssertEqual(Province.mieKen.rawValue, "MIE-KEN")
+        XCTAssertEqual(Province.miyagiKen.rawValue, "MIYAGI-KEN")
+        XCTAssertEqual(Province.miyazakiKen.rawValue, "MIYAZAKI-KEN")
+        XCTAssertEqual(Province.naganoKen.rawValue, "NAGANO-KEN")
+        XCTAssertEqual(Province.nagasakiKen.rawValue, "NAGASAKI-KEN")
+        XCTAssertEqual(Province.naraKen.rawValue, "NARA-KEN")
+        XCTAssertEqual(Province.niigataKen.rawValue, "NIIGATA-KEN")
+        XCTAssertEqual(Province.oitaKen.rawValue, "OITA-KEN")
+        XCTAssertEqual(Province.okayamaKen.rawValue, "OKAYAMA-KEN")
+        XCTAssertEqual(Province.okinawaKen.rawValue, "OKINAWA-KEN")
+        XCTAssertEqual(Province.osakaFu.rawValue, "OSAKA-FU")
+        XCTAssertEqual(Province.sagaKen.rawValue, "SAGA-KEN")
+        XCTAssertEqual(Province.saitamaKen.rawValue, "SAITAMA-KEN")
+        XCTAssertEqual(Province.shigaKen.rawValue, "SHIGA-KEN")
+        XCTAssertEqual(Province.shimaneKen.rawValue, "SHIMANE-KEN")
+        XCTAssertEqual(Province.shizuokaKen.rawValue, "SHIZUOKA-KEN")
+        XCTAssertEqual(Province.tochigiKen.rawValue, "TOCHIGI-KEN")
+        XCTAssertEqual(Province.tokushimaKen.rawValue, "TOKUSHIMA-KEN")
+        XCTAssertEqual(Province.tokyoTo.rawValue, "TOKYO-TO")
+        XCTAssertEqual(Province.tottoriKen.rawValue, "TOTTORI-KEN")
+        XCTAssertEqual(Province.toyamaKen.rawValue, "TOYAMA-KEN")
+        XCTAssertEqual(Province.wakayamaKen.rawValue, "WAKAYAMA-KEN")
+        XCTAssertEqual(Province.yamagataKen.rawValue, "YAMAGATA-KEN")
+        XCTAssertEqual(Province.yamaguchiKen.rawValue, "YAMAGUCHI-KEN")
+        XCTAssertEqual(Province.yamanashiKen.rawValue, "YAMANASHI-KEN")
+        XCTAssertEqual(Province.ags.rawValue, "AGS")
+        XCTAssertEqual(Province.bcs.rawValue, "BCS")
+        XCTAssertEqual(Province.camp.rawValue, "CAMP")
+        XCTAssertEqual(Province.chis.rawValue, "CHIS")
+        XCTAssertEqual(Province.chih.rawValue, "CHIH")
+        XCTAssertEqual(Province.cdmx.rawValue, "CDMX")
+        XCTAssertEqual(Province.coah.rawValue, "COAH")
+        XCTAssertEqual(Province.col.rawValue, "COL")
+        XCTAssertEqual(Province.dgo.rawValue, "DGO")
+        XCTAssertEqual(Province.mex.rawValue, "MEX")
+        XCTAssertEqual(Province.gto.rawValue, "GTO")
+        XCTAssertEqual(Province.gro.rawValue, "GRO")
+        XCTAssertEqual(Province.hgo.rawValue, "HGO")
+        XCTAssertEqual(Province.jal.rawValue, "JAL")
+        XCTAssertEqual(Province.mich.rawValue, "MICH")
+        XCTAssertEqual(Province.mor.rawValue, "MOR")
+        XCTAssertEqual(Province.nay.rawValue, "NAY")
+        XCTAssertEqual(Province.oax.rawValue, "OAX")
+        XCTAssertEqual(Province.pue.rawValue, "PUE")
+        XCTAssertEqual(Province.qro.rawValue, "QRO")
+        XCTAssertEqual(Province.qROO.rawValue, "Q ROO")
+        XCTAssertEqual(Province.slp.rawValue, "SLP")
+        XCTAssertEqual(Province.sin.rawValue, "SIN")
+        XCTAssertEqual(Province.son.rawValue, "SON")
+        XCTAssertEqual(Province.tab.rawValue, "TAB")
+        XCTAssertEqual(Province.tamps.rawValue, "TAMPS")
+        XCTAssertEqual(Province.tlax.rawValue, "TLAX")
+        XCTAssertEqual(Province.ver.rawValue, "VER")
+        XCTAssertEqual(Province.yuc.rawValue, "YUC")
+        XCTAssertEqual(Province.zac.rawValue, "ZAC")
+        XCTAssertEqual(Province.amnatCharoen.rawValue, "Amnat Charoen")
+        XCTAssertEqual(Province.angThong.rawValue, "Ang Thong")
+        XCTAssertEqual(Province.bangkok.rawValue, "Bangkok")
+        XCTAssertEqual(Province.buengKan.rawValue, "Bueng Kan")
+        XCTAssertEqual(Province.buriRam.rawValue, "Buri Ram")
+        XCTAssertEqual(Province.chachoengsao.rawValue, "Chachoengsao")
+        XCTAssertEqual(Province.chaiNat.rawValue, "Chai Nat")
+        XCTAssertEqual(Province.chaiyaphum.rawValue, "Chaiyaphum")
+        XCTAssertEqual(Province.chanthaburi.rawValue, "Chanthaburi")
+        XCTAssertEqual(Province.chiangMai.rawValue, "Chiang Mai")
+        XCTAssertEqual(Province.chiangRai.rawValue, "Chiang Rai")
+        XCTAssertEqual(Province.chonBuri.rawValue, "Chon Buri")
+        XCTAssertEqual(Province.chumphon.rawValue, "Chumphon")
+        XCTAssertEqual(Province.kalasin.rawValue, "Kalasin")
+        XCTAssertEqual(Province.kamphaengPhet.rawValue, "Kamphaeng Phet")
+        XCTAssertEqual(Province.kanchanaburi.rawValue, "Kanchanaburi")
+        XCTAssertEqual(Province.khonKaen.rawValue, "Khon Kaen")
+        XCTAssertEqual(Province.krabi.rawValue, "Krabi")
+        XCTAssertEqual(Province.lampang.rawValue, "Lampang")
+        XCTAssertEqual(Province.lamphun.rawValue, "Lamphun")
+        XCTAssertEqual(Province.loei.rawValue, "Loei")
+        XCTAssertEqual(Province.lopBuri.rawValue, "Lop Buri")
+        XCTAssertEqual(Province.maeHongSon.rawValue, "Mae Hong Son")
+        XCTAssertEqual(Province.mahaSarakham.rawValue, "Maha Sarakham")
+        XCTAssertEqual(Province.mukdahan.rawValue, "Mukdahan")
+        XCTAssertEqual(Province.nakhonNayok.rawValue, "Nakhon Nayok")
+        XCTAssertEqual(Province.nakhonPathom.rawValue, "Nakhon Pathom")
+        XCTAssertEqual(Province.nakhonPhanom.rawValue, "Nakhon Phanom")
+        XCTAssertEqual(Province.nakhonRatchasima.rawValue, "Nakhon Ratchasima")
+        XCTAssertEqual(Province.nakhonSawan.rawValue, "Nakhon Sawan")
+        XCTAssertEqual(Province.nakhonSiThammarat.rawValue, "Nakhon Si Thammarat")
+        XCTAssertEqual(Province.nan.rawValue, "Nan")
+        XCTAssertEqual(Province.narathiwat.rawValue, "Narathiwat")
+        XCTAssertEqual(Province.nongBuaLamphu.rawValue, "Nong Bua Lamphu")
+        XCTAssertEqual(Province.nongKhai.rawValue, "Nong Khai")
+        XCTAssertEqual(Province.nonthaburi.rawValue, "Nonthaburi")
+        XCTAssertEqual(Province.pathumThani.rawValue, "Pathum Thani")
+        XCTAssertEqual(Province.pattani.rawValue, "Pattani")
+        XCTAssertEqual(Province.phangNga.rawValue, "Phang Nga")
+        XCTAssertEqual(Province.phatthalung.rawValue, "Phatthalung")
+        XCTAssertEqual(Province.phatthaya.rawValue, "Phatthaya")
+        XCTAssertEqual(Province.phayao.rawValue, "Phayao")
+        XCTAssertEqual(Province.phetchabun.rawValue, "Phetchabun")
+        XCTAssertEqual(Province.phetchaburi.rawValue, "Phetchaburi")
+        XCTAssertEqual(Province.phichit.rawValue, "Phichit")
+        XCTAssertEqual(Province.phitsanulok.rawValue, "Phitsanulok")
+        XCTAssertEqual(Province.phraNakhonSiAyutthaya.rawValue, "Phra Nakhon Si Ayutthaya")
+        XCTAssertEqual(Province.phrae.rawValue, "Phrae")
+        XCTAssertEqual(Province.phuket.rawValue, "Phuket")
+        XCTAssertEqual(Province.prachinBuri.rawValue, "Prachin Buri")
+        XCTAssertEqual(Province.prachuapKhiriKhan.rawValue, "Prachuap Khiri Khan")
+        XCTAssertEqual(Province.ranong.rawValue, "Ranong")
+        XCTAssertEqual(Province.ratchaburi.rawValue, "Ratchaburi")
+        XCTAssertEqual(Province.rayong.rawValue, "Rayong")
+        XCTAssertEqual(Province.roiEt.rawValue, "Roi Et")
+        XCTAssertEqual(Province.saKaeo.rawValue, "Sa Kaeo")
+        XCTAssertEqual(Province.sakonNakhon.rawValue, "Sakon Nakhon")
+        XCTAssertEqual(Province.samutPrakan.rawValue, "Samut Prakan")
+        XCTAssertEqual(Province.samutSakhon.rawValue, "Samut Sakhon")
+        XCTAssertEqual(Province.samutSongkhram.rawValue, "Samut Songkhram")
+        XCTAssertEqual(Province.saraburi.rawValue, "Saraburi")
+        XCTAssertEqual(Province.satun.rawValue, "Satun")
+        XCTAssertEqual(Province.siSaKet.rawValue, "Si Sa Ket")
+        XCTAssertEqual(Province.singBuri.rawValue, "Sing Buri")
+        XCTAssertEqual(Province.songkhla.rawValue, "Songkhla")
+        XCTAssertEqual(Province.sukhothai.rawValue, "Sukhothai")
+        XCTAssertEqual(Province.suphanBuri.rawValue, "Suphan Buri")
+        XCTAssertEqual(Province.suratThani.rawValue, "Surat Thani")
+        XCTAssertEqual(Province.surin.rawValue, "Surin")
+        XCTAssertEqual(Province.tak.rawValue, "Tak")
+        XCTAssertEqual(Province.trang.rawValue, "Trang")
+        XCTAssertEqual(Province.trat.rawValue, "Trat")
+        XCTAssertEqual(Province.ubonRatchathani.rawValue, "Ubon Ratchathani")
+        XCTAssertEqual(Province.udonThani.rawValue, "Udon Thani")
+        XCTAssertEqual(Province.uthaiThani.rawValue, "Uthai Thani")
+        XCTAssertEqual(Province.uttaradit.rawValue, "Uttaradit")
+        XCTAssertEqual(Province.yala.rawValue, "Yala")
+        XCTAssertEqual(Province.yasothon.rawValue, "Yasothon")
+        XCTAssertEqual(Province.ak.rawValue, "AK")
+        XCTAssertEqual(Province.az.rawValue, "AZ")
+        XCTAssertEqual(Province.de.rawValue, "DE")
+        XCTAssertEqual(Province.dc.rawValue, "DC")
+        XCTAssertEqual(Province.fl.rawValue, "FL")
+        XCTAssertEqual(Province.ga.rawValue, "GA")
+        XCTAssertEqual(Province.hi.rawValue, "HI")
+        XCTAssertEqual(Province.il.rawValue, "IL")
+        XCTAssertEqual(Province.`in`.rawValue, "IN")
+        XCTAssertEqual(Province.ia.rawValue, "IA")
+        XCTAssertEqual(Province.ks.rawValue, "KS")
+        XCTAssertEqual(Province.ky.rawValue, "KY")
+        XCTAssertEqual(Province.la.rawValue, "LA")
+        XCTAssertEqual(Province.md.rawValue, "MD")
+        XCTAssertEqual(Province.ne.rawValue, "NE")
+        XCTAssertEqual(Province.nv.rawValue, "NV")
+        XCTAssertEqual(Province.nh.rawValue, "NH")
+        XCTAssertEqual(Province.nj.rawValue, "NJ")
+        XCTAssertEqual(Province.nm.rawValue, "NM")
+        XCTAssertEqual(Province.ny.rawValue, "NY")
+        XCTAssertEqual(Province.nc.rawValue, "NC")
+        XCTAssertEqual(Province.nd.rawValue, "ND")
+        XCTAssertEqual(Province.oh.rawValue, "OH")
+        XCTAssertEqual(Province.ok.rawValue, "OK")
+        XCTAssertEqual(Province.sd.rawValue, "SD")
+        XCTAssertEqual(Province.tx.rawValue, "TX")
+        XCTAssertEqual(Province.ut.rawValue, "UT")
+        XCTAssertEqual(Province.wa.rawValue, "WA")
+        XCTAssertEqual(Province.wv.rawValue, "WV")
+        XCTAssertEqual(Province.wi.rawValue, "WI")
+        XCTAssertEqual(Province.wy.rawValue, "WY")
+        XCTAssertEqual(Province.aa.rawValue, "AA")
+        XCTAssertEqual(Province.ae.rawValue, "AE")
+        XCTAssertEqual(Province.`as`.rawValue, "AS")
+        XCTAssertEqual(Province.gu.rawValue, "GU")
+        XCTAssertEqual(Province.mh.rawValue, "MH")
+        XCTAssertEqual(Province.mp.rawValue, "MP")
+        XCTAssertEqual(Province.pw.rawValue, "PW")
+    }
+    
+    func testAllCase() {
+        XCTAssertEqual(Province.allCases.count, 453)
+        XCTAssertEqual(Province.allCases, [
+            .ciudadAutónomaDeBuenosAires, .buenosAires, .catamarca, .chaco, .chubut, .corrientes, .córdoba, .entreRíos, .formosa, .jujuy, .laPampa,
+            .laRioja, .mendoza, .misiones, .neuquén, .ríoNegro, .salta, .sanJuan, .sanLuis, .santaCruz, .santaFe, .santiagoDelEstero,
+            .tierraDelFuego, .tucumán, .ac, .al, .ap, .am, .ba, .ce, .df, .es, .go, .ma, .mt, .ms, .mg, .pr, .pb, .pa, .pe, .pi, .rn, .rs, .rj, .ro,
+            .rr, .sc, .se, .sp, .to, .ab, .bc, .mb, .nb, .nl, .nt, .ns, .nu, .on, .qc, .sk, .yt, .cnAh, .cnBj, .cnCq, .cnFj, .cnGd, .cnGs, .cnGx,
+            .cnGz, .cnHa, .cnHb, .cnHe, .cnHi, .cnHk, .cnHl, .cnHn, .cnJl, .cnJs, .cnJx, .cnLn, .cnMo, .cnNm, .cnNx, .cnQh, .cnSc, .cnSd, .cnSh,
+            .cnSn, .cnSx, .cnTj, .cnTw, .cnXj, .cnXz, .cnYn, .cnZj, .andamanAndNicobarIslands, .andhraPradesh, .apo, .arunachalPradesh, .assam,
+            .bihar, .chandigarh, .chhattisgarh, .dadraAndNagarHaveli, .damanAndDiu, .delhiNCT, .goa, .gujarat, .haryana, .himachalPradesh,
+            .jammuAndKashmir, .jharkhand, .karnataka, .kerala, .lakshadweep, .madhyaPradesh, .maharashtra, .manipur, .meghalaya, .mizoram,
+            .nagaland, .odisha, .puducherry, .punjab, .rajasthan, .sikkim, .tamilNadu, .telangana, .tripura, .uttarPradesh, .uttarakhand,
+            .westBengal, .idBa, .idBb, .idBt, .idBe, .idYo, .idJk, .idGo, .idJa, .idJb, .idJt, .idJi, .idKb, .idKs, .idKt, .idKi, .idKu, .idKr,
+            .idLa, .idMa, .idMu, .idAc, .idNb, .idNt, .idPa, .idPb, .idRi, .idSr, .idSn, .idSt, .idSg, .idSa, .idSb, .idSs, .idSu, .ag, .an, .ao,
+            .ar, .at, .av, .bt, .bl, .bn, .bg, .bi, .bo, .bz, .bs, .br, .ca, .cl, .cb, .ci, .ct, .cz, .ch, .co, .cs, .cr, .kr, .en, .fm, .fe, .fi,
+            .fg, .fc, .fr, .ge, .gr, .im, .`is`, .aq, .lt, .le, .lc, .li, .lo, .lu, .mc, .mn, .vs, .me, .mi, .mo, .na, .no, .og, .ot, .or, .pd,
+            .pv, .pg, .pu, .pc, .pt, .pn, .pz, .po, .rg, .ra, .rc, .re, .ri, .rm, .sa, .ss, .sv, .si, .sr, .so, .ta, .te, .tr, .tp, .tn, .tv, .ts,
+            .ud, .va, .ve, .vb, .vc, .vr, .vv, .vi, .vt, .aichiKen, .akitaKen, .aomoriKen, .chibaKen, .ehimeKen, .fukuiKen, .fukuokaKen,
+            .fukushimaKen, .gifuKen, .gunmaKen, .hiroshimaKen, .hokkaido, .hyogoKen, .ibarakiKen, .ishikawaKen, .iwateKen, .kagawaKen,
+            .kagoshimaKen, .kanagawaKen, .kochiKen, .kumamotoKen, .kyotoFu, .mieKen, .miyagiKen, .miyazakiKen, .naganoKen, .nagasakiKen, .naraKen,
+            .niigataKen, .oitaKen, .okayamaKen, .okinawaKen, .osakaFu, .sagaKen, .saitamaKen, .shigaKen, .shimaneKen, .shizuokaKen, .tochigiKen,
+            .tokushimaKen, .tokyoTo, .tottoriKen, .toyamaKen, .wakayamaKen, .yamagataKen, .yamaguchiKen, .yamanashiKen, .ags, .bcs, .camp, .chis,
+            .chih, .cdmx, .coah, .col, .dgo, .mex, .gto, .gro, .hgo, .jal, .mich, .mor, .nay, .oax, .pue, .qro, .qROO, .slp, .sin, .son, .tab,
+            .tamps, .tlax, .ver, .yuc, .zac, .amnatCharoen, .angThong, .bangkok, .buengKan, .buriRam, .chachoengsao, .chaiNat, .chaiyaphum,
+            .chanthaburi, .chiangMai, .chiangRai, .chonBuri, .chumphon, .kalasin, .kamphaengPhet, .kanchanaburi, .khonKaen, .krabi, .lampang,
+            .lamphun, .loei, .lopBuri, .maeHongSon, .mahaSarakham, .mukdahan, .nakhonNayok, .nakhonPathom, .nakhonPhanom, .nakhonRatchasima,
+            .nakhonSawan, .nakhonSiThammarat, .nan, .narathiwat, .nongBuaLamphu, .nongKhai, .nonthaburi, .pathumThani, .pattani, .phangNga,
+            .phatthalung, .phatthaya, .phayao, .phetchabun, .phetchaburi, .phichit, .phitsanulok, .phraNakhonSiAyutthaya, .phrae, .phuket,
+            .prachinBuri, .prachuapKhiriKhan, .ranong, .ratchaburi, .rayong, .roiEt, .saKaeo, .sakonNakhon, .samutPrakan, .samutSakhon,
+            .samutSongkhram, .saraburi, .satun, .siSaKet, .singBuri, .songkhla, .sukhothai, .suphanBuri, .suratThani, .surin, .tak, .trang, .trat,
+            .ubonRatchathani, .udonThani, .uthaiThani, .uttaradit, .yala, .yasothon, .ak, .az, .de, .dc, .fl, .ga, .hi, .il, .`in`, .ia, .ks, .ky,
+            .la, .md, .ne, .nv, .nh, .nj, .nm, .ny, .nc, .nd, .oh, .ok, .sd, .tx, .ut, .wa, .wv, .wi, .wy, .aa, .ae, .`as`, .gu, .mh, .mp, .pw
+        ])
+    }
+    
+    func testEncoding()throws {
+        let encoder = JSONEncoder()
+        let ciudadAutónomaDeBuenosAires = try String(data: encoder.encode(Land(prov: .ciudadAutónomaDeBuenosAires)), encoding: .utf8)
+        let mp = try String(data: encoder.encode(Land(prov: .mp)), encoding: .utf8)
+
+        XCTAssertEqual(ciudadAutónomaDeBuenosAires, "{\"prov\":\"CIUDAD AUTÓNOMA DE BUENOS AIRES\"}")
+        XCTAssertEqual(mp, "{\"prov\":\"MP\"}")
+    }
+    
+    func testDecoding()throws {
+        let decoder = JSONDecoder()
+        let gifuKen = """
+        {
+            "prov": "GIFU-KEN"
+        }
+        """.data(using: .utf8)!
+        let cnXj = """
+        {
+            "prov": "CN-XJ"
+        }
+        """
+
+        try XCTAssertEqual(decoder.decode(Land.self, from: gifuKen).prov, .gifuKen)
+        try XCTAssertEqual(decoder.decode(Land.self, from: cnXj).prov, .cnXj)
+    }
+    
+    static var allTests: [(String, (ProvinceTests) -> ()throws -> ())] = [
+        ("testCaseRawValues", testCaseRawValues),
+        ("testAllCase", testAllCase),
+        ("testEncoding", testEncoding),
+        ("testDecoding", testDecoding)
+    ]
+}
+
+
+
+
diff --git a/Tests/PayPalTests/ModelTests/RefundDetailTests.swift b/Tests/PayPalTests/ModelTests/RefundDetailTests.swift
index 9a2cdbc2..af1e6f72 100644
--- a/Tests/PayPalTests/ModelTests/RefundDetailTests.swift
+++ b/Tests/PayPalTests/ModelTests/RefundDetailTests.swift
@@ -5,18 +5,18 @@ final class RefundDetailTests: XCTestCase {
     let now = Date().iso8601
     
     func testInit()throws {
-        let detail = try RefundDetail(date: self.now, note: "Hello World", amount: Amount(currency: .usd, value: "4.50"))
+        let detail = RefundDetail(date: self.now, note: "Hello World", amount: CurrencyAmount(currency: .usd, value: 4.50))
         
         XCTAssertNil(detail.type)
         XCTAssertNil(detail.transaction)
         XCTAssertEqual(detail.date, self.now)
         XCTAssertEqual(detail.note, "Hello World")
-        try XCTAssertEqual(detail.amount, Amount(currency: .usd, value: "4.50"))
+        XCTAssertEqual(detail.amount, CurrencyAmount(currency: .usd, value: 4.50))
     }
     
     func testEncoding()throws {
         let encoder = JSONEncoder()
-        let detail = try RefundDetail(date: self.now, note: "Hello World", amount: Amount(currency: .usd, value: "4.50"))
+        let detail = RefundDetail(date: self.now, note: "Hello World", amount: CurrencyAmount(currency: .usd, value: 4.50))
         let generated = try String(data: encoder.encode(detail), encoding: .utf8)!
         let json = "{\"date\":\"\(self.now)\",\"amount\":{\"value\":\"4.50\",\"currency\":\"USD\"},\"note\":\"Hello World\"}"
         
@@ -32,7 +32,7 @@ final class RefundDetailTests: XCTestCase {
     
     func testDecoding()throws {
         let decoder = JSONDecoder()
-        let detail = try RefundDetail(date: self.now, note: "Hello World", amount: Amount(currency: .usd, value: "4.50"))
+        let detail = RefundDetail(date: self.now, note: "Hello World", amount: CurrencyAmount(currency: .usd, value: 4.50))
         let json = """
         {
             "amount": {
diff --git a/Tests/PayPalTests/ModelTests/RefundTests.swift b/Tests/PayPalTests/ModelTests/RefundTests.swift
index e2315d7c..86ce49c0 100644
--- a/Tests/PayPalTests/ModelTests/RefundTests.swift
+++ b/Tests/PayPalTests/ModelTests/RefundTests.swift
@@ -3,14 +3,14 @@ import XCTest
 
 final class RefundTests: XCTestCase {
     func testInit()throws {
-        let refund = try Refund(amount: DetailedAmount(currency: .usd, total: "10.00", details: nil))
+        let refund = Refund(amount: DetailedAmount(currency: .usd, total: 10.00, details: nil))
         
-        try XCTAssertEqual(refund.amount, DetailedAmount(currency: .usd, total: "10.00", details: nil))
+        XCTAssertEqual(refund.amount, DetailedAmount(currency: .usd, total: 10.00, details: nil))
     }
     
     func testEncoding()throws {
         let encoder = JSONEncoder()
-        let refund = try Refund(amount: DetailedAmount(currency: .usd, total: "10.00", details: nil))
+        let refund = Refund(amount: DetailedAmount(currency: .usd, total: 10.00, details: nil))
         let generated = try String(data: encoder.encode(refund), encoding: .utf8)!
         let json = "{\"amount\":{\"currency\":\"USD\",\"total\":\"10.00\"}}"
         
@@ -48,7 +48,7 @@ final class RefundTests: XCTestCase {
         XCTAssertEqual(refund.sale, "3B9C13B1-B7C0-494F-B6F2-DE8365052806")
         XCTAssertEqual(refund.status, .pending)
         XCTAssertEqual(refund.links, [])
-        try XCTAssertEqual(refund.amount, DetailedAmount(currency: .usd, total: "10.00", details: nil))
+        XCTAssertEqual(refund.amount, DetailedAmount(currency: .usd, total: 10.00, details: nil))
     }
     
     static var allTests: [(String, (RefundTests) -> ()throws -> ())] = [
diff --git a/Tests/PayPalTests/ModelTests/RelatedResourceAuthorizationTests.swift b/Tests/PayPalTests/ModelTests/RelatedResourceAuthorizationTests.swift
index d3b7a922..c8accf48 100644
--- a/Tests/PayPalTests/ModelTests/RelatedResourceAuthorizationTests.swift
+++ b/Tests/PayPalTests/ModelTests/RelatedResourceAuthorizationTests.swift
@@ -5,8 +5,8 @@ final class RelatedResourceAuthorizationTests: XCTestCase {
     let now = Date()
     
     func testInit()throws {
-        let auth = try RelatedResource.Authorization(
-            amount: .init(currency: .usd, total: "5896.00", details: nil),
+        let auth = RelatedResource.Authorization(
+            amount: .init(currency: .usd, total: 5896.00, details: nil),
             fmf: .init(type: .deny, id: .addressMismatch, name: "Name", description: "Desc."),
             processor: .init(code: "6399", avs: "e", cvv: "h", advice: .newAccount, eci: "152823", vpas: "stat")
         )
@@ -26,13 +26,13 @@ final class RelatedResourceAuthorizationTests: XCTestCase {
         
         XCTAssertEqual(auth.fmf, .init(type: .deny, id: .addressMismatch, name: "Name", description: "Desc."))
         XCTAssertEqual(auth.processor, .init(code: "6399", avs: "e", cvv: "h", advice: .newAccount, eci: "152823", vpas: "stat"))
-        try XCTAssertEqual(auth.amount, .init(currency: .usd, total: "5896.00", details: nil))
+        XCTAssertEqual(auth.amount, .init(currency: .usd, total: 5896.00, details: nil))
     }
     
     func testEncoding()throws {
         let encoder = JSONEncoder()
-        let auth = try RelatedResource.Authorization(
-            amount: .init(currency: .usd, total: "5896.00", details: nil),
+        let auth = RelatedResource.Authorization(
+            amount: .init(currency: .usd, total: 5896.00, details: nil),
             fmf: .init(type: .deny, id: .addressMismatch, name: "Name", description: "Desc."),
             processor: .init(code: "6399", avs: "e", cvv: "h", advice: .newAccount, eci: "152823", vpas: "stat")
         )
@@ -110,7 +110,7 @@ final class RelatedResourceAuthorizationTests: XCTestCase {
             RelatedResource.ProcessorResponse(code: "6399", avs: "e", cvv: "h", advice: .newAccount, eci: "152823", vpas: "stat")
         )
         
-        try XCTAssertEqual(auth.amount, DetailedAmount(currency: .usd, total: "42.31", details: nil))
+        XCTAssertEqual(auth.amount, DetailedAmount(currency: .usd, total: 42.31, details: nil))
     }
     
     static var allTests: [(String, (RelatedResourceAuthorizationTests) -> ()throws -> ())] = [
diff --git a/Tests/PayPalTests/ModelTests/RelatedResourceCaptureTests.swift b/Tests/PayPalTests/ModelTests/RelatedResourceCaptureTests.swift
index f0641fd2..6cf2445d 100644
--- a/Tests/PayPalTests/ModelTests/RelatedResourceCaptureTests.swift
+++ b/Tests/PayPalTests/ModelTests/RelatedResourceCaptureTests.swift
@@ -4,10 +4,10 @@ import XCTest
 final class RelatedResourceCaptureTests: XCTestCase {
     func testInit()throws {
         let capture = try RelatedResource.Capture(
-            amount: DetailedAmount(currency: .usd, total: "67.23", details: nil),
+            amount: DetailedAmount(currency: .usd, total: 67.23, details: nil),
             isFinal: false,
             invoice: "242841E3-7ADE-4C5C-AC88-78103E2132F2",
-            transaction: Amount(currency: .usd, value: "2.71"),
+            transaction: CurrencyAmount(currency: .usd, value: 2.71),
             payerNote: "Notable text"
         )
         
@@ -22,8 +22,8 @@ final class RelatedResourceCaptureTests: XCTestCase {
         XCTAssertEqual(capture.isFinal, false)
         XCTAssertEqual(capture.invoice, "242841E3-7ADE-4C5C-AC88-78103E2132F2")
         XCTAssertEqual(capture.payerNote, "Notable text")
-        try XCTAssertEqual(capture.amount, DetailedAmount(currency: .usd, total: "67.23", details: nil))
-        try XCTAssertEqual(capture.transaction, Amount(currency: .usd, value: "2.71"))
+        XCTAssertEqual(capture.transaction, CurrencyAmount(currency: .usd, value: 2.71))
+        XCTAssertEqual(capture.amount, DetailedAmount(currency: .usd, total: 67.23, details: nil))
     }
     
     func testValidations()throws {
@@ -42,10 +42,10 @@ final class RelatedResourceCaptureTests: XCTestCase {
             payerNote: String(repeating: "p", count: 256)
         ))
         var capture = try RelatedResource.Capture(
-            amount: DetailedAmount(currency: .usd, total: "67.23", details: nil),
+            amount: DetailedAmount(currency: .usd, total: 67.23, details: nil),
             isFinal: false,
             invoice: "242841E3-7ADE-4C5C-AC88-78103E2132F2",
-            transaction: Amount(currency: .usd, value: "2.71"),
+            transaction: CurrencyAmount(currency: .usd, value: 2.71),
             payerNote: "Notable text"
         )
         
@@ -61,10 +61,10 @@ final class RelatedResourceCaptureTests: XCTestCase {
     func testEncoding()throws {
         let encoder = JSONEncoder()
         let capture = try RelatedResource.Capture(
-            amount: DetailedAmount(currency: .usd, total: "67.23", details: nil),
+            amount: DetailedAmount(currency: .usd, total: 67.23, details: nil),
             isFinal: false,
             invoice: "242841E3-7ADE-4C5C-AC88-78103E2132F2",
-            transaction: Amount(currency: .usd, value: "2.71"),
+            transaction: CurrencyAmount(currency: .usd, value: 2.71),
             payerNote: "Notable text"
         )
         let generated = try String(data: encoder.encode(capture), encoding: .utf8)!
@@ -133,8 +133,8 @@ final class RelatedResourceCaptureTests: XCTestCase {
         XCTAssertEqual(capture.isFinal, false)
         XCTAssertEqual(capture.invoice, "242841E3-7ADE-4C5C-AC88-78103E2132F2")
         XCTAssertEqual(capture.payerNote, "Notable text")
-        try XCTAssertEqual(capture.transaction, Amount(currency: .usd, value: "2.71"))
-        try XCTAssertEqual(capture.amount, DetailedAmount(currency: .usd, total: "67.23", details: nil))
+        XCTAssertEqual(capture.transaction, CurrencyAmount(currency: .usd, value: 2.71))
+        XCTAssertEqual(capture.amount, DetailedAmount(currency: .usd, total: 67.23, details: nil))
         
     }
     
diff --git a/Tests/PayPalTests/ModelTests/RelatedResourceOrderTests.swift b/Tests/PayPalTests/ModelTests/RelatedResourceOrderTests.swift
index 8a906cb8..02dcfbe3 100644
--- a/Tests/PayPalTests/ModelTests/RelatedResourceOrderTests.swift
+++ b/Tests/PayPalTests/ModelTests/RelatedResourceOrderTests.swift
@@ -5,8 +5,8 @@ final class RelatedResourceOrderTests: XCTestCase {
     let now = Date()
     
     func testInit()throws {
-        let order = try RelatedResource.Order(
-            amount: DetailedAmount(currency: .usd, total: "645.12", details: nil),
+        let order = RelatedResource.Order(
+            amount: DetailedAmount(currency: .usd, total: 645.12, details: nil),
             fmf: FraudManagementFilter(type: .accept, id: .maxAmount, name: nil, description: nil)
         )
         
@@ -22,13 +22,13 @@ final class RelatedResourceOrderTests: XCTestCase {
         XCTAssertNil(order.links)
         
         XCTAssertEqual(order.fmf, FraudManagementFilter(type: .accept, id: .maxAmount, name: nil, description: nil))
-        try XCTAssertEqual(order.amount, DetailedAmount(currency: .usd, total: "645.12", details: nil))
+        XCTAssertEqual(order.amount, DetailedAmount(currency: .usd, total: 645.12, details: nil))
     }
     
     func testEncoding()throws {
         let encoder = JSONEncoder()
-        let order = try RelatedResource.Order(
-            amount: DetailedAmount(currency: .usd, total: "645.12", details: nil),
+        let order = RelatedResource.Order(
+            amount: DetailedAmount(currency: .usd, total: 645.12, details: nil),
             fmf: FraudManagementFilter(type: .accept, id: .maxAmount, name: nil, description: nil)
         )
         let generated = try String(data: encoder.encode(order), encoding: .utf8)!
@@ -88,7 +88,7 @@ final class RelatedResourceOrderTests: XCTestCase {
         XCTAssertEqual(sale.updated, updated.iso8601)
         XCTAssertEqual(sale.links, [])
         
-        try XCTAssertEqual(sale.amount, DetailedAmount(currency: .usd, total: "645.12", details: nil))
+        XCTAssertEqual(sale.amount, DetailedAmount(currency: .usd, total: 645.12, details: nil))
     }
     
     static var allTests: [(String, (RelatedResourceOrderTests) -> ()throws -> ())] = [
diff --git a/Tests/PayPalTests/ModelTests/RelatedResourceRefundTests.swift b/Tests/PayPalTests/ModelTests/RelatedResourceRefundTests.swift
index 8ec3e6fd..a5e2b36b 100644
--- a/Tests/PayPalTests/ModelTests/RelatedResourceRefundTests.swift
+++ b/Tests/PayPalTests/ModelTests/RelatedResourceRefundTests.swift
@@ -4,7 +4,7 @@ import XCTest
 final class RelatedResourceRefundTests: XCTestCase {
     func testInit()throws {
         let refund = try RelatedResource.Refund(
-            amount: DetailedAmount(currency: .usd, total: "67.23", details: nil),
+            amount: DetailedAmount(currency: .usd, total: 67.23, details: nil),
             reason: "Reasonable",
             invoice: "3086FF5B-13F2-4B6A-AB02-AD1C347B163C",
             description: "Descript"
@@ -22,7 +22,7 @@ final class RelatedResourceRefundTests: XCTestCase {
         XCTAssertEqual(refund.reason, "Reasonable")
         XCTAssertEqual(refund.invoice, "3086FF5B-13F2-4B6A-AB02-AD1C347B163C")
         XCTAssertEqual(refund.description, "Descript")
-        try XCTAssertEqual(refund.amount, DetailedAmount(currency: .usd, total: "67.23", details: nil))
+        XCTAssertEqual(refund.amount, DetailedAmount(currency: .usd, total: 67.23, details: nil))
     }
     
     func testValidations()throws {
@@ -33,7 +33,7 @@ final class RelatedResourceRefundTests: XCTestCase {
             description: nil
         ))
         var refund = try RelatedResource.Refund(
-            amount: DetailedAmount(currency: .usd, total: "67.23", details: nil),
+            amount: DetailedAmount(currency: .usd, total: 67.23, details: nil),
             reason: "Reasonable",
             invoice: "3086FF5B-13F2-4B6A-AB02-AD1C347B163C",
             description: "Descript"
@@ -48,7 +48,7 @@ final class RelatedResourceRefundTests: XCTestCase {
     func testEncoding()throws {
         let encoder = JSONEncoder()
         let refund = try RelatedResource.Refund(
-            amount: DetailedAmount(currency: .usd, total: "67.23", details: nil),
+            amount: DetailedAmount(currency: .usd, total: 67.23, details: nil),
             reason: "Reasonable",
             invoice: "3086FF5B-13F2-4B6A-AB02-AD1C347B163C",
             description: "Descript"
@@ -111,7 +111,7 @@ final class RelatedResourceRefundTests: XCTestCase {
         XCTAssertEqual(refund.created, created.iso8601)
         XCTAssertEqual(refund.updated, updated.iso8601)
         XCTAssertEqual(refund.links, [])
-        try XCTAssertEqual(refund.amount, DetailedAmount(currency: .usd, total: "67.23", details: nil))
+        XCTAssertEqual(refund.amount, DetailedAmount(currency: .usd, total: 67.23, details: nil))
         
     }
     
diff --git a/Tests/PayPalTests/ModelTests/RelatedResourceSaleTests.swift b/Tests/PayPalTests/ModelTests/RelatedResourceSaleTests.swift
index 86a27015..fc5a8e36 100644
--- a/Tests/PayPalTests/ModelTests/RelatedResourceSaleTests.swift
+++ b/Tests/PayPalTests/ModelTests/RelatedResourceSaleTests.swift
@@ -5,12 +5,12 @@ final class RelatedResourceSaleTests: XCTestCase {
     let now = Date()
     
     func testInit()throws {
-        let sale = try RelatedResource.Sale(
+        let sale = RelatedResource.Sale(
             id: "9FF17892-49F8-47C9-8117-7662F889DAEA",
-            amount: DetailedAmount(currency: .usd, total: "42.31", details: nil),
+            amount: DetailedAmount(currency: .usd, total: 42.31, details: nil),
             state: .pending,
-            transaction: Amount(currency: .usd, value: "0.31"),
-            receivable: Amount(currency: .usd, value: "42.00"),
+            transaction: CurrencyAmount(currency: .usd, value: 0.31),
+            receivable: CurrencyAmount(currency: .usd, value: 42.00),
             exchangeRate: "0.0",
             fmf: .init(type: .deny, id: .addressMismatch, name: "Name", description: "Desc."),
             processor: .init(code: "6399", avs: "e", cvv: "h", advice: .newAccount, eci: "152823", vpas: "stat"),
@@ -25,19 +25,19 @@ final class RelatedResourceSaleTests: XCTestCase {
         XCTAssertEqual(sale.processor, .init(code: "6399", avs: "e", cvv: "h", advice: .newAccount, eci: "152823", vpas: "stat"))
         XCTAssertEqual(sale.parent, "E7FBF930-B0F3-4514-B1DD-810BDCD6541F")
         XCTAssertEqual(sale.created, self.now.iso8601)
-        try XCTAssertEqual(sale.amount, DetailedAmount(currency: .usd, total: "42.31", details: nil))
-        try XCTAssertEqual(sale.transaction, Amount(currency: .usd, value: "0.31"))
-        try XCTAssertEqual(sale.receivable, Amount(currency: .usd, value: "42.00"))
+        XCTAssertEqual(sale.transaction, CurrencyAmount(currency: .usd, value: 0.31))
+        XCTAssertEqual(sale.receivable, CurrencyAmount(currency: .usd, value: 42.00))
+        XCTAssertEqual(sale.amount, DetailedAmount(currency: .usd, total: 42.31, details: nil))
     }
     
     func testEncoding()throws {
         let encoder = JSONEncoder()
-        let sale = try RelatedResource.Sale(
+        let sale = RelatedResource.Sale(
             id: "9FF17892-49F8-47C9-8117-7662F889DAEA",
-            amount: DetailedAmount(currency: .usd, total: "42.31", details: nil),
+            amount: DetailedAmount(currency: .usd, total: 42.31, details: nil),
             state: .pending,
-            transaction: Amount(currency: .usd, value: "0.31"),
-            receivable: Amount(currency: .usd, value: "42.00"),
+            transaction: CurrencyAmount(currency: .usd, value: 0.31),
+            receivable: CurrencyAmount(currency: .usd, value: 42.00),
             exchangeRate: "0.0",
             fmf: .init(type: .deny, id: .addressMismatch, name: "Name", description: "Desc."),
             processor: .init(code: "6399", avs: "e", cvv: "h", advice: .newAccount, eci: "152823", vpas: "stat"),
@@ -136,9 +136,9 @@ final class RelatedResourceSaleTests: XCTestCase {
             RelatedResource.ProcessorResponse(code: "6399", avs: "e", cvv: "h", advice: .newAccount, eci: "152823", vpas: "stat")
         )
         
-        try XCTAssertEqual(sale.receivable, Amount(currency: .usd, value: "42.00"))
-        try XCTAssertEqual(sale.transaction, Amount(currency: .usd, value: "0.31"))
-        try XCTAssertEqual(sale.amount, DetailedAmount(currency: .usd, total: "42.31", details: nil))
+        XCTAssertEqual(sale.receivable, CurrencyAmount(currency: .usd, value: 42.00))
+        XCTAssertEqual(sale.transaction, CurrencyAmount(currency: .usd, value: 0.31))
+        XCTAssertEqual(sale.amount, DetailedAmount(currency: .usd, total: 42.31, details: nil))
     }
     
     static var allTests: [(String, (RelatedResourceSaleTests) -> ()throws -> ())] = [
diff --git a/Tests/PayPalTests/ModelTests/RelatedResourceTests.swift b/Tests/PayPalTests/ModelTests/RelatedResourceTests.swift
index fde4fc8f..4fcde4b6 100644
--- a/Tests/PayPalTests/ModelTests/RelatedResourceTests.swift
+++ b/Tests/PayPalTests/ModelTests/RelatedResourceTests.swift
@@ -4,20 +4,20 @@ import XCTest
 final class RelatedResourceTests: XCTestCase {
     func testInit()throws {
         let resource = try RelatedResource(
-            sale: .init(id: "", amount: DetailedAmount(currency: .usd, total: "10", details: nil), state: .pending, parent: "10"),
-            authorization: .init(amount: DetailedAmount(currency: .usd, total: "10", details: nil), fmf: nil, processor: nil),
-            order: .init(amount: DetailedAmount(currency: .usd, total: "10", details: nil), fmf: nil),
+            sale: .init(id: "", amount: DetailedAmount(currency: .usd, total: 10.0, details: nil), state: .pending, parent: "10"),
+            authorization: .init(amount: DetailedAmount(currency: .usd, total: 10, details: nil), fmf: nil, processor: nil),
+            order: .init(amount: DetailedAmount(currency: .usd, total: 10, details: nil), fmf: nil),
             capture: .init(amount: nil, isFinal: nil, invoice: nil, transaction: nil, payerNote: nil),
             refund: .init(amount: nil, reason: nil, invoice: nil, description: nil)
         )
         
         try XCTAssertEqual(resource.refund, .init(amount: nil, reason: nil, invoice: nil, description: nil))
-        try XCTAssertEqual(resource.order, .init(amount: DetailedAmount(currency: .usd, total: "10", details: nil), fmf: nil))
+        XCTAssertEqual(resource.order, .init(amount: DetailedAmount(currency: .usd, total: 10, details: nil), fmf: nil))
         try XCTAssertEqual(resource.capture, .init(amount: nil, isFinal: nil, invoice: nil, transaction: nil, payerNote: nil))
-        try XCTAssertEqual(resource.authorization, .init(amount: DetailedAmount(currency: .usd, total: "10", details: nil), fmf: nil, processor: nil))
-        try XCTAssertEqual(
+        XCTAssertEqual(resource.authorization, .init(amount: DetailedAmount(currency: .usd, total: 10, details: nil), fmf: nil, processor: nil))
+        XCTAssertEqual(
             resource.sale,
-            .init(id: "", amount: DetailedAmount(currency: .usd, total: "10", details: nil), state: .pending, parent: "10")
+            .init(id: "", amount: DetailedAmount(currency: .usd, total: 10, details: nil), state: .pending, parent: "10")
         )
     }
     
@@ -25,9 +25,9 @@ final class RelatedResourceTests: XCTestCase {
         let encoder = JSONEncoder()
         let date = Date().iso8601
         let resource = try RelatedResource(
-            sale: .init(id: "", amount: DetailedAmount(currency: .usd, total: "10", details: nil), state: .pending, parent: "10", created: date),
-            authorization: .init(amount: DetailedAmount(currency: .usd, total: "10", details: nil), fmf: nil, processor: nil),
-            order: .init(amount: DetailedAmount(currency: .usd, total: "10", details: nil), fmf: nil),
+            sale: .init(id: "", amount: DetailedAmount(currency: .usd, total: 10, details: nil), state: .pending, parent: "10", created: date),
+            authorization: .init(amount: DetailedAmount(currency: .usd, total: 10, details: nil), fmf: nil, processor: nil),
+            order: .init(amount: DetailedAmount(currency: .usd, total: 10, details: nil), fmf: nil),
             capture: .init(amount: nil, isFinal: nil, invoice: nil, transaction: nil, payerNote: nil),
             refund: .init(amount: nil, reason: nil, invoice: nil, description: nil)
         )
@@ -82,9 +82,9 @@ final class RelatedResourceTests: XCTestCase {
         """.data(using: .utf8)!
         
         let resource = try RelatedResource(
-            sale: .init(id: "", amount: DetailedAmount(currency: .usd, total: "10", details: nil), state: .pending, parent: "10", created: date),
-            authorization: .init(amount: DetailedAmount(currency: .usd, total: "10", details: nil), fmf: nil, processor: nil),
-            order: .init(amount: DetailedAmount(currency: .usd, total: "10", details: nil), fmf: nil),
+            sale: .init(id: "", amount: DetailedAmount(currency: .usd, total: 10, details: nil), state: .pending, parent: "10", created: date),
+            authorization: .init(amount: DetailedAmount(currency: .usd, total: 10, details: nil), fmf: nil, processor: nil),
+            order: .init(amount: DetailedAmount(currency: .usd, total: 10, details: nil), fmf: nil),
             capture: .init(amount: nil, isFinal: nil, invoice: nil, transaction: nil, payerNote: nil),
             refund: .init(amount: nil, reason: nil, invoice: nil, description: nil)
         )
diff --git a/Tests/PayPalTests/ModelTests/SaleTests.swift b/Tests/PayPalTests/ModelTests/SaleTests.swift
index 259dafaa..8234fc8e 100644
--- a/Tests/PayPalTests/ModelTests/SaleTests.swift
+++ b/Tests/PayPalTests/ModelTests/SaleTests.swift
@@ -3,20 +3,20 @@ import XCTest
 
 final class SaleTests: XCTestCase {
     func testInit()throws {
-        let sale = try Sale(amount: DetailedAmount(currency: .usd, total: "10.00", details: nil), transaction: Amount(currency: .usd, value: "1.00"))
+        let sale = Sale(amount: DetailedAmount(currency: .usd, total: 10.00, details: nil), transaction: CurrencyAmount(currency: .usd, value: 1.00))
         
         XCTAssertNil(sale.id)
         XCTAssertNil(sale.status)
         XCTAssertNil(sale.created)
         XCTAssertNil(sale.updated)
         XCTAssertNil(sale.links)
-        try XCTAssertEqual(sale.amount, DetailedAmount(currency: .usd, total: "10.00", details: nil))
-        try XCTAssertEqual(sale.transaction, Amount(currency: .usd, value: "1.00"))
+        XCTAssertEqual(sale.transaction, CurrencyAmount(currency: .usd, value: 1.00))
+        XCTAssertEqual(sale.amount, DetailedAmount(currency: .usd, total: 10.00, details: nil))
     }
     
     func testEncoding()throws {
         let encoder = JSONEncoder()
-        let sale = try Sale(amount: DetailedAmount(currency: .usd, total: "10.00", details: nil), transaction: Amount(currency: .usd, value: "1.00"))
+        let sale = Sale(amount: DetailedAmount(currency: .usd, total: 10.00, details: nil), transaction: CurrencyAmount(currency: .usd, value: 1.00))
         let generated = try String(data: encoder.encode(sale), encoding: .utf8)!
         let json = "{\"amount\":{\"currency\":\"USD\",\"total\":\"10.00\"},\"transaction_fee\":{\"value\":\"1.00\",\"currency\":\"USD\"}}"
         
@@ -58,8 +58,8 @@ final class SaleTests: XCTestCase {
         XCTAssertEqual(sale.created, "2018-09-18T21:22:51+0000")
         XCTAssertEqual(sale.updated, "2018-09-18T21:23:25+0000")
         XCTAssertEqual(sale.links, [])
-        try XCTAssertEqual(sale.amount, DetailedAmount(currency: .usd, total: "10.00", details: nil))
-        try XCTAssertEqual(sale.transaction, Amount(currency: .usd, value: "1.00"))
+        XCTAssertEqual(sale.transaction, CurrencyAmount(currency: .usd, value: 1.00))
+        XCTAssertEqual(sale.amount, DetailedAmount(currency: .usd, total: 10.00, details: nil))
     }
     
     static var allTests: [(String, (SaleTests) -> ()throws -> ())] = [
diff --git a/Tests/PayPalTests/ModelTests/ShippingCostsTests.swift b/Tests/PayPalTests/ModelTests/ShippingCostsTests.swift
index 3ed6f9e5..edbd673e 100644
--- a/Tests/PayPalTests/ModelTests/ShippingCostsTests.swift
+++ b/Tests/PayPalTests/ModelTests/ShippingCostsTests.swift
@@ -4,19 +4,19 @@ import XCTest
 final class ShippingCostsTests: XCTestCase {
     func testInit()throws {
         let shipping = try ShippingCosts(
-            amount: Amount(currency: .usd, value: "2.50"),
-            tax: Tax(name: "Shipping", percent: 7.5, amount: Amount(currency: .usd, value: "0.18"))
+            amount: CurrencyAmount(currency: .usd, value: 2.50),
+            tax: Tax(name: "Shipping", percent: 7.5, amount: CurrencyAmount(currency: .usd, value: 0.18))
         )
         
-        try XCTAssertEqual(shipping.amount,  Amount(currency: .usd, value: "2.50"))
-        try XCTAssertEqual(shipping.tax, Tax(name: "Shipping", percent: 7.5, amount: Amount(currency: .usd, value: "0.18")))
+        XCTAssertEqual(shipping.amount,  CurrencyAmount(currency: .usd, value: 2.50))
+        try XCTAssertEqual(shipping.tax, Tax(name: "Shipping", percent: 7.5, amount: CurrencyAmount(currency: .usd, value: 0.18)))
     }
     
     func testEncoding()throws {
         let encoder = JSONEncoder()
         let shipping = try ShippingCosts(
-            amount: Amount(currency: .usd, value: "2.50"),
-            tax: Tax(name: "Shipping", percent: 7.5, amount: Amount(currency: .usd, value: "0.18"))
+            amount: CurrencyAmount(currency: .usd, value: 2.50),
+            tax: Tax(name: "Shipping", percent: 7.5, amount: CurrencyAmount(currency: .usd, value: 0.18))
         )
         let generated = try String(data: encoder.encode(shipping), encoding: .utf8)!
         let json =
@@ -36,8 +36,8 @@ final class ShippingCostsTests: XCTestCase {
     func testDecoding()throws {
         let decoder = JSONDecoder()
         let shipping = try ShippingCosts(
-            amount: Amount(currency: .usd, value: "2.50"),
-            tax: Tax(name: "Shipping", percent: 7.5, amount: Amount(currency: .usd, value: "0.18"))
+            amount: CurrencyAmount(currency: .usd, value: 2.50),
+            tax: Tax(name: "Shipping", percent: 7.5, amount: CurrencyAmount(currency: .usd, value: 0.18))
         )
         
         let json = """
diff --git a/Tests/PayPalTests/ModelTests/ShippingInfoTests.swift b/Tests/PayPalTests/ModelTests/ShippingInfoTests.swift
index d822f3a4..0c7a9ef9 100644
--- a/Tests/PayPalTests/ModelTests/ShippingInfoTests.swift
+++ b/Tests/PayPalTests/ModelTests/ShippingInfoTests.swift
@@ -14,7 +14,7 @@ final class ShippingInfoTests: XCTestCase {
                 line2: nil,
                 city: "Glipwood",
                 state: nil,
-                countryCode: "SK",
+                country: .switzerland,
                 postalCode: "562",
                 phone: nil,
                 type: nil
@@ -24,14 +24,14 @@ final class ShippingInfoTests: XCTestCase {
         XCTAssertEqual(info.firstName, "Oskar")
         XCTAssertEqual(info.lastName, "Reteep")
         XCTAssertEqual(info.businessName, "Books and Crannies")
-        try XCTAssertEqual(info.address, Address(
+        XCTAssertEqual(info.address, Address(
             recipientName: "Oskar Reteep",
             defaultAddress: true,
             line1: "1 Main Street",
             line2: nil,
             city: "Glipwood",
             state: nil,
-            countryCode: "SK",
+            country: .switzerland,
             postalCode: "562",
             phone: nil,
             type: nil
diff --git a/Tests/PayPalTests/ModelTests/StakeholderTests.swift b/Tests/PayPalTests/ModelTests/StakeholderTests.swift
index 9300700a..0e4719e7 100644
--- a/Tests/PayPalTests/ModelTests/StakeholderTests.swift
+++ b/Tests/PayPalTests/ModelTests/StakeholderTests.swift
@@ -5,52 +5,42 @@ final class StakeholderTests: XCTestCase {
     func testInit()throws {
         let holder = try Business.Stakeholder(
             type: .partner,
-            country: "US",
+            country: .unitedStates,
             birth: TimelessDate(date: "2000-06-18"),
             name: Name(prefix: "Sir", given: "Walter", surname: "Scott", middle: nil, suffix: "auth.", full: "Sir Walter Scott"),
             addresses: [],
             phones: [],
             ids: [],
-            birthplace: BirthPlace(country: "US", city: "Boston")
+            birthplace: BirthPlace(country: .unitedStates, city: "Boston")
         )
         
         XCTAssertNil(holder.ownership)
         XCTAssertEqual(holder.type, .partner)
-        XCTAssertEqual(holder.country, "US")
+        XCTAssertEqual(holder.country, .unitedStates)
         XCTAssertEqual(holder.addresses, [])
         XCTAssertEqual(holder.phones, [])
         XCTAssertEqual(holder.ids, [])
-        try XCTAssertEqual(holder.birth, TimelessDate(date: "2000-06-18"))
-        try XCTAssertEqual(holder.birthplace, BirthPlace(country: "US", city: "Boston"))
+        XCTAssertEqual(holder.birth, TimelessDate(date: "2000-06-18"))
+        XCTAssertEqual(holder.birthplace, BirthPlace(country: .unitedStates, city: "Boston"))
         try XCTAssertEqual(holder.name, Name(prefix: "Sir", given: "Walter", surname: "Scott", middle: nil, suffix: "auth.", full: "Sir Walter Scott"))
     }
     
-    func testValidations()throws {
-        try XCTAssertThrowsError(Business.Stakeholder(type: nil, country: "USA", birth: nil, name: nil, addresses: [], phones: [], ids: [], birthplace: nil))
-        var holder = try Business.Stakeholder(type: nil, country: "US", birth: nil, name: nil, addresses: [], phones: [], ids: [], birthplace: nil)
-        
-        try XCTAssertThrowsError(holder.set(\.country <~ "Aus."))
-        try holder.set(\.country <~ "AU")
-        
-        XCTAssertEqual(holder.country, "AU")
-    }
-    
     func testEncoding()throws {
         let encoder = JSONEncoder()
         let holder = try Business.Stakeholder(
             type: .partner,
-            country: "US",
+            country: .unitedStates,
             birth: TimelessDate(date: "2000-06-18"),
             name: Name(prefix: nil, given: nil, surname: nil, middle: nil, suffix: nil, full: nil),
             addresses: [],
             phones: [],
             ids: [],
-            birthplace: BirthPlace(country: "US", city: "Boston")
+            birthplace: BirthPlace(country: .unitedStates, city: "Boston")
         )
         let generated = try String(data: encoder.encode(holder), encoding: .utf8)!
         let json =
-            "{\"place_of_birth\":{\"country_code\":\"US\",\"city\":\"Boston\"},\"identifications\":[],\"phones\":[],\"addresses\":[],\"name\":{}," +
-            "\"date_of_birth\":{\"date_no_time\":\"2000-06-18\"},\"country_code_of_nationality\":\"US\",\"type\":\"PARTNER\"}"
+            "{\"phones\":[],\"country_code_of_nationality\":\"US\",\"date_of_birth\":{\"date_no_time\":\"2000-06-18\"},\"addresses\":[]," +
+            "\"identifications\":[],\"type\":\"PARTNER\",\"name\":{},\"place_of_birth\":{\"country_code\":\"US\",\"city\":\"Boston\"}}"
         
         var index = 0
         for (jsonChar, genChar) in zip(json, generated) {
@@ -83,13 +73,13 @@ final class StakeholderTests: XCTestCase {
         """.data(using: .utf8)!
         let holder = try Business.Stakeholder(
             type: .partner,
-            country: "US",
+            country: .unitedStates,
             birth: TimelessDate(date: "2000-06-18"),
             name: Name(prefix: nil, given: nil, surname: nil, middle: nil, suffix: nil, full: nil),
             addresses: [],
             phones: [],
             ids: [],
-            birthplace: BirthPlace(country: "US", city: "Boston")
+            birthplace: BirthPlace(country: .unitedStates, city: "Boston")
         )
         
         try XCTAssertEqual(holder, decoder.decode(Business.Stakeholder.self, from: json))
@@ -97,7 +87,6 @@ final class StakeholderTests: XCTestCase {
     
     static var allTests: [(String, (StakeholderTests) -> ()throws -> ())] = [
         ("testInit", testInit),
-        ("testValidations", testValidations),
         ("testEncoding", testEncoding),
         ("testDecoding", testDecoding)
     ]
diff --git a/Tests/PayPalTests/ModelTests/TaxTests.swift b/Tests/PayPalTests/ModelTests/TaxTests.swift
index a5f5ad94..99c7f783 100644
--- a/Tests/PayPalTests/ModelTests/TaxTests.swift
+++ b/Tests/PayPalTests/ModelTests/TaxTests.swift
@@ -3,11 +3,11 @@ import XCTest
 
 final class TaxTests: XCTestCase {
     func testInit()throws {
-        let tax = try Tax(name: "Sales", percent: 10, amount: Amount(currency: .usd, value: "0.59"))
+        let tax = try Tax(name: "Sales", percent: 10, amount: CurrencyAmount(currency: .usd, value: 0.59))
         
         XCTAssertEqual(tax.name, "Sales")
         XCTAssertEqual(tax.percent, 10)
-        try XCTAssertEqual(tax.amount, Amount(currency: .usd, value: "0.59"))
+        XCTAssertEqual(tax.amount, CurrencyAmount(currency: .usd, value: 0.59))
     }
     
     func testValidations()throws {
diff --git a/Tests/PayPalTests/ModelTests/TemplateDataTests.swift b/Tests/PayPalTests/ModelTests/TemplateDataTests.swift
index 46c43752..384b5fc2 100644
--- a/Tests/PayPalTests/ModelTests/TemplateDataTests.swift
+++ b/Tests/PayPalTests/ModelTests/TemplateDataTests.swift
@@ -26,9 +26,9 @@ final class TemplateDataTests: XCTestCase {
             reference: "PO number",
             discount: nil,
             shippingCost: nil,
-            custom: CustomAmount(label: nil, amount: Amount(currency: .usd, value: "10.00")),
+            custom: CustomAmount(label: nil, amount: CurrencyAmount(currency: .usd, value: 10.00)),
             allowPartialPayment: false,
-            minimumDue: Amount(currency: .usd, value: "1.00"),
+            minimumDue: CurrencyAmount(currency: .usd, value: 1.00),
             taxCalculatedAfterDiscount: true,
             taxInclusive: true,
             terms: nil,
@@ -56,7 +56,7 @@ final class TemplateDataTests: XCTestCase {
         XCTAssertEqual(data.logo, "https://vapor.codes/dist/e032390c38279fbdf18ebf0e763eb44f.png")
         XCTAssertEqual(data.attachments, [FileAttachment(name: "photo.jpg", url: "https://avatars3.githubusercontent.com/u/2872298?s=200&v=4")])
         
-        try XCTAssertEqual(data.custom, CustomAmount(label: nil, amount: Amount(currency: .usd, value: "10.00")))
+        XCTAssertEqual(data.custom, CustomAmount(label: nil, amount: CurrencyAmount(currency: .usd, value: 10.00)))
         try XCTAssertEqual(data.cc, [.init(email: "collective@vapor.codes"), .init(email: "donator@example.com")])
         try XCTAssertEqual(data.merchant, MerchantInfo(
             email: "hello@vapor.codes",
@@ -148,9 +148,9 @@ final class TemplateDataTests: XCTestCase {
             reference: "PO number",
             discount: nil,
             shippingCost: nil,
-            custom: CustomAmount(label: nil, amount: Amount(currency: .usd, value: "10.00")),
+            custom: CustomAmount(label: nil, amount: CurrencyAmount(currency: .usd, value: 10.00)),
             allowPartialPayment: false,
-            minimumDue: Amount(currency: .usd, value: "1.00"),
+            minimumDue: CurrencyAmount(currency: .usd, value: 1.00),
             taxCalculatedAfterDiscount: true,
             taxInclusive: true,
             terms: nil,
@@ -306,9 +306,9 @@ final class TemplateDataTests: XCTestCase {
             reference: "PO number",
             discount: nil,
             shippingCost: nil,
-            custom: CustomAmount(label: nil, amount: Amount(currency: .usd, value: "10.00")),
+            custom: CustomAmount(label: nil, amount: CurrencyAmount(currency: .usd, value: 10.00)),
             allowPartialPayment: false,
-            minimumDue: Amount(currency: .usd, value: "1.00"),
+            minimumDue: CurrencyAmount(currency: .usd, value: 1.00),
             taxCalculatedAfterDiscount: true,
             taxInclusive: true,
             terms: nil,
diff --git a/Tests/PayPalTests/ModelTests/TemplateListTests.swift b/Tests/PayPalTests/ModelTests/TemplateListTests.swift
index f94f865c..f895dab6 100644
--- a/Tests/PayPalTests/ModelTests/TemplateListTests.swift
+++ b/Tests/PayPalTests/ModelTests/TemplateListTests.swift
@@ -3,7 +3,7 @@ import XCTest
 
 final class TemplateListTests: XCTestCase {
     func testInit()throws {
-        let list = TemplateList(addresses: [], emails: [], phones: [], templates: [])
+        let list = Template.List(addresses: [], emails: [], phones: [], templates: [])
         
         XCTAssertNil(list.links)
         XCTAssertEqual(list.addresses, [])
@@ -14,9 +14,9 @@ final class TemplateListTests: XCTestCase {
     
     func testEncoding()throws {
         let encoder = JSONEncoder()
-        let list = TemplateList(addresses: [], emails: [], phones: [], templates: [])
+        let list = Template.List(addresses: [], emails: [], phones: [], templates: [])
         let generated = try String(data: encoder.encode(list), encoding: .utf8)!
-        let json = "{\"templates\":[],\"phones\":[],\"emails\":[],\"addresses\":[]}"
+        let json = "{\"templates\":[],\"addresses\":[],\"emails\":[],\"phones\":[]}"
         
         var index = 0
         for (jsonChar, genChar) in zip(json, generated) {
@@ -38,9 +38,9 @@ final class TemplateListTests: XCTestCase {
             "templates": []
         }
         """.data(using: .utf8)!
-        let list = TemplateList(addresses: [], emails: [], phones: [], templates: [])
+        let list = Template.List(addresses: [], emails: [], phones: [], templates: [])
         
-        try XCTAssertEqual(list, decoder.decode(TemplateList.self, from: json))
+        try XCTAssertEqual(list, decoder.decode(Template.List.self, from: json))
     }
     
     static var allTests: [(String, (TemplateListTests) -> ()throws -> ())] = [
diff --git a/Tests/PayPalTests/ModelTests/TermTests.swift b/Tests/PayPalTests/ModelTests/TermTests.swift
index 22b6fafc..c447d0c8 100644
--- a/Tests/PayPalTests/ModelTests/TermTests.swift
+++ b/Tests/PayPalTests/ModelTests/TermTests.swift
@@ -5,9 +5,9 @@ final class TermTests: XCTestCase {
     func testInit()throws {
         let term = try Term(
             type: .monthly,
-            maxAmount: Money(currency: .usd, value: "14.99"),
+            maxAmount: CurrencyCodeAmount(currency: .usd, value: 14.99),
             occurrences: "1",
-            amountRange: Money(currency: .usd, value: "9.99"),
+            amountRange: CurrencyCodeAmount(currency: .usd, value: 9.99),
             editable: "FALSE"
         )
         
@@ -15,17 +15,17 @@ final class TermTests: XCTestCase {
         XCTAssertEqual(term.type, .monthly)
         XCTAssertEqual(term.occurrences, "1")
         XCTAssertEqual(term.editable, "FALSE")
-        try XCTAssertEqual(term.amountRange, Money(currency: .usd, value: "9.99"))
-        try XCTAssertEqual(term.maxAmount, Money(currency: .usd, value: "14.99"))
+        XCTAssertEqual(term.amountRange, CurrencyCodeAmount(currency: .usd, value: 9.99))
+        XCTAssertEqual(term.maxAmount, CurrencyCodeAmount(currency: .usd, value: 14.99))
     }
     
     func testEncoding()throws {
         let encoder = JSONEncoder()
         let term = try Term(
             type: .monthly,
-            maxAmount: Money(currency: .usd, value: "14.99"),
+            maxAmount: CurrencyCodeAmount(currency: .usd, value: 14.99),
             occurrences: "1",
-            amountRange: Money(currency: .usd, value: "9.99"),
+            amountRange: CurrencyCodeAmount(currency: .usd, value: 9.99),
             editable: "FALSE"
         )
         let generated = try String(data: encoder.encode(term), encoding: .utf8)!
@@ -62,9 +62,9 @@ final class TermTests: XCTestCase {
         """.data(using: .utf8)!
         let term = try Term(
             type: .monthly,
-            maxAmount: Money(currency: .usd, value: "14.99"),
+            maxAmount: CurrencyCodeAmount(currency: .usd, value: 14.99),
             occurrences: "1",
-            amountRange: Money(currency: .usd, value: "9.99"),
+            amountRange: CurrencyCodeAmount(currency: .usd, value: 9.99),
             editable: "FALSE"
         )
         
diff --git a/Tests/PayPalTests/ModelTests/TimelessDateTests.swift b/Tests/PayPalTests/ModelTests/TimelessDateTests.swift
index f0e5079f..8c10b8b6 100644
--- a/Tests/PayPalTests/ModelTests/TimelessDateTests.swift
+++ b/Tests/PayPalTests/ModelTests/TimelessDateTests.swift
@@ -3,26 +3,21 @@ import XCTest
 
 final class TimelessDateTests: XCTestCase {
     func testInit()throws {
-        let date = try TimelessDate(date: "1517-10-31")
+        let epoch = TimelessDate(date: "1970-01-01")
+        let date: TimelessDate = 981_244_800.0
         
-        XCTAssertEqual(date.date, "1517-10-31")
-    }
-    
-    func testValidations()throws {
-        try XCTAssertThrowsError(TimelessDate(date: "10/31/1517"))
-        var date = try TimelessDate(date: "1517-10-31")
-        
-        try XCTAssertThrowsError(date.set(\.date <~ "11/20/2020"))
-        try date.set(\.date <~ "2020-11-20")
-        
-        XCTAssertEqual(date.date, "2020-11-20")
+        XCTAssertNotNil(epoch)
+        XCTAssertEqual(epoch?.timestamp, 0)
+        XCTAssertEqual(date.timestamp, 981_244_800)
+        XCTAssertEqual(TimelessDate.formatter.string(from: Date(timeIntervalSince1970: date.timestamp ?? 0)), "2001-02-04")
     }
     
     func testEncoding()throws {
         let encoder = JSONEncoder()
-        let date = try TimelessDate(date: "1517-10-31")
+        let date = TimelessDate(date: "2001-02-04")!
+        
         let generated = try String(data: encoder.encode(date), encoding: .utf8)
-        let json = "{\"date_no_time\":\"1517-10-31\"}"
+        let json = "{\"date_no_time\":\"2001-02-04\"}"
         
         XCTAssertEqual(generated, json)
     }
@@ -32,17 +27,16 @@ final class TimelessDateTests: XCTestCase {
         
         let json = """
         {
-            "date_no_time": "1517-10-31"
+            "date_no_time": "2001-02-04"
         }
         """
         
-        let date = try TimelessDate(date: "1517-10-31")
+        let date = TimelessDate(date: "2001-02-04")!
         try XCTAssertEqual(date, decoder.decode(TimelessDate.self, from: json))
     }
     
     static var allTests: [(String, (TimelessDateTests) -> ()throws -> ())] = [
         ("testInit", testInit),
-        ("testValidations", testValidations),
         ("testEncoding", testEncoding),
         ("testDecoding", testDecoding)
     ]
diff --git a/Tests/PayPalTests/ModelTests/TransactionInfoTests.swift b/Tests/PayPalTests/ModelTests/TransactionInfoTests.swift
index 491acc76..d59b10b4 100644
--- a/Tests/PayPalTests/ModelTests/TransactionInfoTests.swift
+++ b/Tests/PayPalTests/ModelTests/TransactionInfoTests.swift
@@ -10,7 +10,7 @@ final class TransactionInfoTests: XCTestCase {
             sellerID: "3DE7148F-360E-4F22-9DE2-8507E24DB60B",
             created: self.now,
             status: .pending,
-            gross: Money(currency: .usd, value: "89.45"),
+            gross: CurrencyCodeAmount(currency: .usd, value: 89.45),
             invoice: "C80ED435-DBB2-456B-A1EF-2750A32AAF1A",
             custom: nil,
             buyer: Buyer(email: "witheringheights@exmaple.com", name: "Leeli Wingfeather"),
@@ -28,7 +28,7 @@ final class TransactionInfoTests: XCTestCase {
         
         try XCTAssertEqual(transaction.buyer, Buyer(email: "witheringheights@exmaple.com", name: "Leeli Wingfeather"))
         try XCTAssertEqual(transaction.seller, Seller(email: "throg@exmaple.com", name: "Nag the Nameless", merchantID: nil))
-        try XCTAssertEqual(transaction.gross, Money(currency: .usd, value: "89.45"))
+        XCTAssertEqual(transaction.gross, CurrencyCodeAmount(currency: .usd, value: 89.45))
     }
     
     func testEncoding()throws {
@@ -38,7 +38,7 @@ final class TransactionInfoTests: XCTestCase {
             sellerID: "3DE7148F-360E-4F22-9DE2-8507E24DB60B",
             created: self.now,
             status: .pending,
-            gross: Money(currency: .usd, value: "89.45"),
+            gross: CurrencyCodeAmount(currency: .usd, value: 89.45),
             invoice: "C80ED435-DBB2-456B-A1EF-2750A32AAF1A",
             custom: nil,
             buyer: Buyer(email: "witheringheights@exmaple.com", name: "Leeli Wingfeather"),
@@ -89,7 +89,7 @@ final class TransactionInfoTests: XCTestCase {
             sellerID: "3DE7148F-360E-4F22-9DE2-8507E24DB60B",
             created: self.now,
             status: .pending,
-            gross: Money(currency: .usd, value: "89.45"),
+            gross: CurrencyCodeAmount(currency: .usd, value: 89.45),
             invoice: "C80ED435-DBB2-456B-A1EF-2750A32AAF1A",
             custom: nil,
             buyer: Buyer(email: "witheringheights@exmaple.com", name: "Leeli Wingfeather"),
diff --git a/Tests/PayPalTests/ModelTests/TransactionTests.swift b/Tests/PayPalTests/ModelTests/TransactionTests.swift
index 7c5b5e61..5e3f4d29 100644
--- a/Tests/PayPalTests/ModelTests/TransactionTests.swift
+++ b/Tests/PayPalTests/ModelTests/TransactionTests.swift
@@ -3,10 +3,10 @@ import XCTest
 
 final class TransactionTests: XCTestCase {
     func testInit()throws {
-        let transaction = try Transaction(
-            amount: Money(currency: .usd, value: "79.25"),
-            fee: Money(currency: .usd, value: "7.25"),
-            net: Money(currency: .usd, value: "72.00")
+        let transaction = Transaction(
+            amount: CurrencyCodeAmount(currency: .usd, value: 79.25),
+            fee: CurrencyCodeAmount(currency: .usd, value: 7.25),
+            net: CurrencyCodeAmount(currency: .usd, value: 72.00)
         )
         
         XCTAssertEqual(transaction.id, nil)
@@ -17,17 +17,17 @@ final class TransactionTests: XCTestCase {
         XCTAssertEqual(transaction.timestamp, nil)
         XCTAssertEqual(transaction.timezone, nil)
         
-        try XCTAssertEqual(transaction.amount, Money(currency: .usd, value: "79.25"))
-        try XCTAssertEqual(transaction.fee, Money(currency: .usd, value: "7.25"))
-        try XCTAssertEqual(transaction.net, Money(currency: .usd, value: "72.00"))
+        XCTAssertEqual(transaction.amount, CurrencyCodeAmount(currency: .usd, value: 79.25))
+        XCTAssertEqual(transaction.fee, CurrencyCodeAmount(currency: .usd, value: 7.25))
+        XCTAssertEqual(transaction.net, CurrencyCodeAmount(currency: .usd, value: 72.00))
     }
     
     func testEncoding()throws {
         let encoder = JSONEncoder()
-        let transaction = try Transaction(
-            amount: Money(currency: .usd, value: "79.25"),
-            fee: Money(currency: .usd, value: "7.25"),
-            net: Money(currency: .usd, value: "72.00")
+        let transaction = Transaction(
+            amount: CurrencyCodeAmount(currency: .usd, value: 79.25),
+            fee: CurrencyCodeAmount(currency: .usd, value: 7.25),
+            net: CurrencyCodeAmount(currency: .usd, value: 72.00)
         )
         let generated = try String(data: encoder.encode(transaction), encoding: .utf8)
         let json =
@@ -81,9 +81,9 @@ final class TransactionTests: XCTestCase {
         let transaction = try decoder.decode(Transaction.self, from: full)
         
         try XCTAssertEqual(Transaction(
-            amount: Money(currency: .usd, value: "79.25"),
-            fee: Money(currency: .usd, value: "7.25"),
-            net: Money(currency: .usd, value: "72.00")
+            amount: CurrencyCodeAmount(currency: .usd, value: 79.25),
+            fee: CurrencyCodeAmount(currency: .usd, value: 7.25),
+            net: CurrencyCodeAmount(currency: .usd, value: 72.00)
         ), decoder.decode(Transaction.self, from: minimum))
         
         XCTAssertEqual(transaction.id, "3C3A7405-132B-4516-97AA-51ADE9DC77C6")
@@ -93,9 +93,9 @@ final class TransactionTests: XCTestCase {
         XCTAssertEqual(transaction.name, "Skelpo Inc.")
         XCTAssertEqual(transaction.timestamp, "2018-07-23T17:24:48Z")
         XCTAssertEqual(transaction.timezone, "CDT")
-        try XCTAssertEqual(transaction.amount, Money(currency: .usd, value: "79.25"))
-        try XCTAssertEqual(transaction.fee, Money(currency: .usd, value: "7.25"))
-        try XCTAssertEqual(transaction.net, Money(currency: .usd, value: "72.00"))
+        XCTAssertEqual(transaction.amount, CurrencyCodeAmount(currency: .usd, value: 79.25))
+        XCTAssertEqual(transaction.fee, CurrencyCodeAmount(currency: .usd, value: 7.25))
+        XCTAssertEqual(transaction.net, CurrencyCodeAmount(currency: .usd, value: 72.00))
     }
     
     static var allTests: [(String, (TransactionTests) -> ()throws -> ())] = [
diff --git a/Tests/PayPalTests/ModelTests/UserInfoAddressTests.swift b/Tests/PayPalTests/ModelTests/UserInfoAddressTests.swift
index 9c41c2a2..2eab5167 100644
--- a/Tests/PayPalTests/ModelTests/UserInfoAddressTests.swift
+++ b/Tests/PayPalTests/ModelTests/UserInfoAddressTests.swift
@@ -8,7 +8,7 @@ final class UserInfoAddressTests: XCTestCase {
             "street_address": "Igby Cottage, Dark Sea of Darkness",
             "locality": "Glipwood",
             "postal_code": "1058",
-            "country": "Skree"
+            "country": "CH"
         }
         """.data(using: .utf8)!
         
@@ -18,7 +18,7 @@ final class UserInfoAddressTests: XCTestCase {
         XCTAssertEqual(address.locality, "Glipwood")
         XCTAssertEqual(address.region, nil)
         XCTAssertEqual(address.zip, "1058")
-        XCTAssertEqual(address.country, "Skree")
+        XCTAssertEqual(address.country, .switzerland)
     }
     
     static var allTests: [(String, (UserInfoAddressTests) -> ()throws -> ())] = [
diff --git a/Tests/PayPalTests/ModelTests/UserInfoTests.swift b/Tests/PayPalTests/ModelTests/UserInfoTests.swift
index 71ff104d..15b418d7 100644
--- a/Tests/PayPalTests/ModelTests/UserInfoTests.swift
+++ b/Tests/PayPalTests/ModelTests/UserInfoTests.swift
@@ -20,7 +20,7 @@ final class UserInfoTests: XCTestCase {
             "address": {
                 "locality": "Edinburgh",
                 "postal_code": "1058",
-                "country": "Scotland"
+                "country": "GB"
             },
             "verified_account": true,
             "account_type": "PERSONAL",
@@ -46,7 +46,7 @@ final class UserInfoTests: XCTestCase {
         
         XCTAssertEqual(info.address?.locality, "Edinburgh")
         XCTAssertEqual(info.address?.zip, "1058")
-        XCTAssertEqual(info.address?.country, "Scotland")
+        XCTAssertEqual(info.address?.country, .unitedKingdom)
         
         XCTAssertEqual(info.verified, true)
         XCTAssertEqual(info.accountType, .personal)
diff --git a/Tests/PayPalTests/ModelTests/VenueTests.swift b/Tests/PayPalTests/ModelTests/VenueTests.swift
index 9f85efa7..dffcb929 100644
--- a/Tests/PayPalTests/ModelTests/VenueTests.swift
+++ b/Tests/PayPalTests/ModelTests/VenueTests.swift
@@ -2,10 +2,6 @@ import XCTest
 @testable import PayPal
 
 final class VenueTests: XCTestCase {
-    struct User: Codable {
-        let role: Role
-    }
-    
     struct Prod: Codable {
         let venue: Venue
     }
diff --git a/Tests/PayPalTests/XCTestManifests.swift b/Tests/PayPalTests/XCTestManifests.swift
index 0b3f32fa..ab6d484e 100644
--- a/Tests/PayPalTests/XCTestManifests.swift
+++ b/Tests/PayPalTests/XCTestManifests.swift
@@ -21,7 +21,7 @@ public func allTests() -> [XCTestCaseEntry] {
         testCase(PayPalAPIErrorTests.allCases),
         testCase(PayPalAPIIdentityErrorTests.allCases),
         testCase(ActivityTests.allCases),
-        testCase(ActivitiesResponseTests.allCases),
+        testCase(ActivityResponseTests.allCases),
         testCase(BillingPlanTypeTests.allCases),
         testCase(OverrideChargeTests.allCases),
         testCase(testValueValidation.allCases),
@@ -239,6 +239,7 @@ public func allTests() -> [XCTestCaseEntry] {
         testCase(PaymentRefundStateTests.allCases),
         testCase(PaymentRefundResultTests.allCases),
         testCase(PaymentOptionsMethodTests.allCases),
+        testCase(ProvinceTests.allCases),
         
         // Controller Tests
         testCase(APITests.allTests),