diff --git a/net_api_generator/generator.py b/net_api_generator/generator.py
index 8ecb5d31878c1ce77965ada196e37d9f8c8ded16..986eb619e969bda8fec65af2fccc7ea181ff4902 100644
--- a/net_api_generator/generator.py
+++ b/net_api_generator/generator.py
@@ -134,10 +134,10 @@ class ExplicitNull(object):
 
 
 class APIEndpoint(object):
-\tdef __init__(self, base_url: str, token: str, **kwargs):
-\t\tself.base_url = base_url
+\tdef __init__(self, netdb_base_url:str=None, netdb_token:str=None, **kwargs):
+\t\tself.base_url = netdb_base_url if netdb_base_url is not None kwargs.get('base_url', None)
 \t\tself.version = '{loader.api_version}'
-\t\tself.token = token
+\t\tself.token = netdb_token if netdb_token is not None kwargs.get('token', None)
 
 
 class APISession(object):
@@ -159,7 +159,7 @@ class APISession(object):
 \t\t\t\t\tif v['major'] == ref[0] and v['minor'] == ref[1]:
 \t\t\t\t\t\tif self._build_version != v['numeric']:
 \t\t\t\t\t\t\tlogger.warning(f"This library was built for NETDB API version {{self._build_version}}, but API reports {{v['numeric']}}. Please consider updating. "
-\t\t\t\t\t\t                "(You can disable this message by setting NETDB_CLIENT_DISABLE_UPDATE_CHECK in your environment or passing update_check=False to APISession)")
+\t\t\t\t\t\t                "(You can disable this message by setting NETDB_CLIENT_DISABLE_UPDATE_CHECK in your environment or by passing update_check=False to APISession)")
 \t\t\t\t\t\tbreak
 \t\texcept:
 \t\t\tpass