diff --git a/.env b/.env
new file mode 100644
index 0000000..e9f6e99
--- /dev/null
+++ b/.env
@@ -0,0 +1,2 @@
+API_KEY = MOCK_API_KEY
+SECRET_KEY=MOCK_SECRET_KEY
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 6bce7e7..e2a5cce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -128,3 +128,6 @@ dmypy.json
 # Cython debug symbols
 cython_debug/
 
+# Environment variables
+.env
+
diff --git a/README.md b/README.md
index 4737fa3..9d84db3 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,10 @@ Generate **API KEY** and **Secret Key** from Wazirx website [here](https://wazir
 pip3 install -r requirements.txt
 ```
 
+### Configuration
+Update the `.env` file with your actual API and Secret keys.
+
+
 ## Features
 
 #### Current
diff --git a/wazirx_sapi_client/rest/__init__.py b/wazirx_sapi_client/rest/__init__.py
index eec03e3..7a57187 100644
--- a/wazirx_sapi_client/rest/__init__.py
+++ b/wazirx_sapi_client/rest/__init__.py
@@ -1,6 +1,6 @@
 import sys
 
-if int(sys.version[0]) < 3 or int(sys.version[2]) < 7:
+if sys.version_info < (3, 7):
     raise BaseException("Python>=3.7 required")
 
 from wazirx_sapi_client.rest.client import Client
diff --git a/wazirx_sapi_client/rest/client.py b/wazirx_sapi_client/rest/client.py
index 240245d..b448cd5 100644
--- a/wazirx_sapi_client/rest/client.py
+++ b/wazirx_sapi_client/rest/client.py
@@ -15,7 +15,7 @@ class BaseClient(object):
     API_URL = 'https://api.wazirx.com/sapi/'
 
     def __init__(
-            self, api_key="", secret_key=""
+            self, api_key=os.getenv('API_KEY'), secret_key=os.getenv('SECRET_KEY')
     ):
         self.api_key = api_key
         self.secret_key = secret_key
@@ -24,7 +24,7 @@ def __init__(
 
 class Client(BaseClient):
     def __init__(
-            self, api_key="", secret_key=""
+            self, api_key=os.getenv('API_KEY'), secret_key=os.getenv('SECRET_KEY')
     ):
         super(Client, self).__init__(api_key, secret_key)
 
diff --git a/wazirx_sapi_client/rest/test.py b/wazirx_sapi_client/rest/test.py
index 5aff69d..3fd6454 100644
--- a/wazirx_sapi_client/rest/test.py
+++ b/wazirx_sapi_client/rest/test.py
@@ -9,8 +9,8 @@
 from wazirx_sapi_client.rest import Client
 
 # Keys for private events
-api_key = "test_api_key"
-secret_key = "test_secret_key"
+api_key = os.getenv('API_KEY')
+secret_key = os.getenv('SECRET_KEY')
 
 # public
 c = Client()
diff --git a/wazirx_sapi_client/websocket/__init__.py b/wazirx_sapi_client/websocket/__init__.py
index 972a87d..f54c2c7 100644
--- a/wazirx_sapi_client/websocket/__init__.py
+++ b/wazirx_sapi_client/websocket/__init__.py
@@ -1,6 +1,6 @@
 import sys
 
-if int(sys.version[0]) < 3 or int(sys.version[2]) < 7:
+if sys.version_info < (3, 7):
     raise BaseException("Python>=3.7 required")
 
 from wazirx_sapi_client.websocket.websocket_client import WebsocketClient
diff --git a/wazirx_sapi_client/websocket/test.py b/wazirx_sapi_client/websocket/test.py
index 22bc506..5d40175 100644
--- a/wazirx_sapi_client/websocket/test.py
+++ b/wazirx_sapi_client/websocket/test.py
@@ -17,8 +17,8 @@ async def main():
 
     """
     # Keys for private events
-    api_key = "test_api_key"
-    secret_key = "test_secret_key"
+    api_key = os.getenv('API_KEY')
+    secret_key = os.getenv('SECRET_KEY')
 
     ws_client = WebsocketClient(api_key=api_key, secret_key=secret_key)
 
diff --git a/wazirx_sapi_client/websocket/websocket_client.py b/wazirx_sapi_client/websocket/websocket_client.py
index 48e2965..576ebd7 100644
--- a/wazirx_sapi_client/websocket/websocket_client.py
+++ b/wazirx_sapi_client/websocket/websocket_client.py
@@ -14,7 +14,7 @@
 class BaseWebsocketClient:
     """Wazirx Websocket client implementation"""
 
-    def __init__(self, api_key="", secret_key=""):
+    def __init__(self, api_key=os.getenv('API_KEY'), secret_key=os.getenv('SECRET_KEY')):
         """
         Initialize the object.
         Arguments:
@@ -27,7 +27,7 @@ def __init__(self, api_key="", secret_key=""):
 
 
 class WebsocketClient(BaseWebsocketClient):
-    def __init__(self, api_key="", secret_key=""):
+    def __init__(self, api_key=os.getenv('API_KEY'), secret_key=os.getenv('SECRET_KEY')):
         super(WebsocketClient, self).__init__(api_key, secret_key)
 
     def get_auth_token(self):