diff --git a/easypost/services/billing_service.html b/easypost/services/billing_service.html
index 1a94808..1b2ce96 100644
--- a/easypost/services/billing_service.html
+++ b/easypost/services/billing_service.html
@@ -137,16 +137,17 @@
66
67 if payment_method_to_use and payment_methods[payment_method_to_use]:
68 payment_method_id = payment_methods[payment_method_to_use]["id"]
-69 if payment_method_id.startswith("card_"):
-70 endpoint = "/credit_cards"
-71 elif payment_method_id.startswith("bank_"):
-72 endpoint = "/bank_accounts"
-73 else:
-74 raise InvalidObjectError(message=INVALID_PAYMENT_METHOD_ERROR)
-75 else:
-76 raise InvalidObjectError(message=INVALID_PAYMENT_METHOD_ERROR)
-77
-78 return [endpoint, payment_method_id]
+69 payment_method_object_type = payment_methods[payment_method_to_use].get("object", None)
+70 if payment_method_object_type == "CreditCard":
+71 endpoint = "/credit_cards"
+72 elif payment_method_object_type == "BankAccount":
+73 endpoint = "/bank_accounts"
+74 else:
+75 raise InvalidObjectError(message=INVALID_PAYMENT_METHOD_ERROR)
+76 else:
+77 raise InvalidObjectError(message=INVALID_PAYMENT_METHOD_ERROR)
+78
+79 return [endpoint, payment_method_id]
@@ -210,16 +211,17 @@
67
68 if payment_method_to_use and payment_methods[payment_method_to_use]:
69 payment_method_id = payment_methods[payment_method_to_use]["id"]
-70 if payment_method_id.startswith("card_"):
-71 endpoint = "/credit_cards"
-72 elif payment_method_id.startswith("bank_"):
-73 endpoint = "/bank_accounts"
-74 else:
-75 raise InvalidObjectError(message=INVALID_PAYMENT_METHOD_ERROR)
-76 else:
-77 raise InvalidObjectError(message=INVALID_PAYMENT_METHOD_ERROR)
-78
-79 return [endpoint, payment_method_id]
+70 payment_method_object_type = payment_methods[payment_method_to_use].get("object", None)
+71 if payment_method_object_type == "CreditCard":
+72 endpoint = "/credit_cards"
+73 elif payment_method_object_type == "BankAccount":
+74 endpoint = "/bank_accounts"
+75 else:
+76 raise InvalidObjectError(message=INVALID_PAYMENT_METHOD_ERROR)
+77 else:
+78 raise InvalidObjectError(message=INVALID_PAYMENT_METHOD_ERROR)
+79
+80 return [endpoint, payment_method_id]