diff --git a/pocket_cli/app.py b/pocket_cli/app.py
index be68ad9..d517a8f 100644
--- a/pocket_cli/app.py
+++ b/pocket_cli/app.py
@@ -43,14 +43,22 @@ def configure(self, consumer_key, access_token,
 
         self._storage.clear()
 
-    def get_request_token(self, consumer_key):
+        self._pocket = Pocket(
+            consumer_key,
+            access_token
+        )
+
+    def init_consumer_key(self, consumer_key):
+        self._pocket = Pocket(consumer_key)
+
+    def get_request_token(self):
         return self._pocket.get_request_token(
-            consumer_key, self.REDIRECT_URL
+            self.REDIRECT_URL
         )
 
-    def get_access_token(self, consumer_key, request_token):
+    def get_access_token(self, request_token):
         return self._pocket.get_access_token(
-            consumer_key, request_token
+            request_token
         )
 
     def add_article(self, url, title=None, tags=None):
diff --git a/pocket_cli/cli.py b/pocket_cli/cli.py
index 10d92c2..8a553e3 100644
--- a/pocket_cli/cli.py
+++ b/pocket_cli/cli.py
@@ -48,7 +48,9 @@ def main():
                      '\tdefault:',
               help='Used in calculating reading time for each article')
 def configure(consumer_key, sort_field, words_per_minute):
-    request_token = pocket_app.get_request_token(consumer_key)
+    pocket_app.init_consumer_key(consumer_key)
+
+    request_token = pocket_app.get_request_token()
 
     if not request_token:
         print('Could not obtain request_token')
@@ -62,7 +64,7 @@ def configure(consumer_key, sort_field, words_per_minute):
     webbrowser.open_new_tab(url)
     input()
 
-    access_token = pocket_app.get_access_token(consumer_key, request_token)
+    access_token = pocket_app.get_access_token(request_token)
 
     if not access_token:
         print('Could not obtain access token')
diff --git a/setup.py b/setup.py
index 66a34d5..6d409a5 100644
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name='pocket-cli',
-    version='0.1.4',
+    version='0.1.5',
     author='Rakan Alhneiti',
     author_email='rakan.alhneiti@gmail.com',
     url='https://github.com/rakanalh/pocket-api',