diff --git a/.idea/markdown-exported-files.xml b/.idea/markdown-exported-files.xml
new file mode 100644
index 0000000..5d1f129
--- /dev/null
+++ b/.idea/markdown-exported-files.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MarkdownExportedFiles">
+    <htmlFiles />
+    <imageFiles />
+    <otherFiles />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 016e06d..acb5fc2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: android
 sudo: required
-jdk: oraclejdk8
+dist: trusty
 
 env:
   global:
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..2081288
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,25 @@
+# Changelog
+All notable changes to InAppUpdater will be documented in this file.
+
+## [Unreleased]
+### Added
+- Method to get the Version code of the Available Update
+
+### Changed
+- Pass the Activity to the `Builder()` instead of `start()`
+```java
+mUpdateManager = UpdateManager.Builder(this);
+```
+- No need to pass Activity to `continueUpdate()`
+## [1.0.3-alpha.1] - 2019-07-25
+### Added
+- Debug Logs to the UpdateManager
+
+## [1.0.2] - 2019-07-16
+
+## [1.0.1] - 2019-07-16
+### Changed
+- Package name
+
+## [v1.0] - 2019-07-16
+:tada: Initial Release
\ No newline at end of file
diff --git a/README.md b/README.md
index 0246fd3..4fee505 100644
--- a/README.md
+++ b/README.md
@@ -24,37 +24,48 @@ allprojects {
 ### Step 2: Add the dependency
 ```Gradle
 dependencies {
-    implementation 'com.github.SanojPunchihewa:InAppUpdater:1.0.2'
+    implementation 'com.github.SanojPunchihewa:InAppUpdater:1.0.3'
 }
 ```
 
 ### Step 3: Initialize the UpdateManager
 Initialize the UpdateManager in your `onCreate` method of the Activity
 ```java
-    UpdateManager.Builder().mode(UpdateManagerConstant.IMMEDIATE).start(this);
+    UpdateManager.Builder(this).mode(UpdateManagerConstant.FLEXIBLE).start();
 ```
 
-#### Update Mode
+**Update Mode**
+
 There are two modes
-* Flexible *(default)* - User can use the app during update download, installation and restart needs to be triggered by user
+* Flexible(`UpdateManagerConstant.FLEXIBLE`) *(default)* - User can use the app during update download, installation and restart needs to be triggered by user
 
-* Immediate - User will be blocked until download and installation is finished, restart is triggered automatically
+* Immediate(`UpdateManagerConstant.IMMEDIATE`) - User will be blocked until download and installation is finished, restart is triggered automatically
 
 
-#### Set the update mode
-```java
-     UpdateManager.Builder().mode(UpdateManagerConstant.IMMEDIATE)
-```
-
 ### Step 4: Resume the updates
 Call `continueUpdate` method in your `onResume` method to install waiting updates
 ```java
 @Override
 protected void onResume() {
     super.onResume();
-    UpdateManager.continueUpdate(this);
+    UpdateManager.continueUpdate();
 }
 ```
+**Additionally** you can get the Available Version Code of the update. You can find these codes in the [demo app](/app/src/main/java/com/zanojmobiapps/inappupdatedemoapp/MainActivity.java)
+
+```java
+mUpdateManager.getAvailableVersionCode(new onVersionCheckListener() {
+    @Override
+    public void onReceiveVersionCode(final int code) {
+        // Do something here
+    }
+});
+```
+## :movie_camera: Demo
+Flexible Update             |  Immediate Update
+:-------------------------:|:-------------------------:
+![](/images/gif/flexible_update.gif)  |  ![](/images/gif/immediate_update.gif)
+
 ## :exclamation: Troubleshoot
 - In-app updates works only with devices running **Android 5.0 (API level 21) or higher**
 - In-app updates are available only to user accounts that own the app. So, **make sure the account you’re using has downloaded your app from Google Play at least once before using the account to test in-app updates.**
diff --git a/app/src/main/java/com/zanojmobiapps/inappupdatedemoapp/MainActivity.java b/app/src/main/java/com/zanojmobiapps/inappupdatedemoapp/MainActivity.java
index 64f1ea2..ad62045 100644
--- a/app/src/main/java/com/zanojmobiapps/inappupdatedemoapp/MainActivity.java
+++ b/app/src/main/java/com/zanojmobiapps/inappupdatedemoapp/MainActivity.java
@@ -1,25 +1,55 @@
 package com.zanojmobiapps.inappupdatedemoapp;
 
-import androidx.appcompat.app.AppCompatActivity;
 import android.os.Bundle;
-
+import android.view.View;
+import android.widget.TextView;
+import androidx.appcompat.app.AppCompatActivity;
 import com.sanojpunchihewa.updatemanager.UpdateManager;
+import com.sanojpunchihewa.updatemanager.UpdateManager.onVersionCheckListener;
 import com.sanojpunchihewa.updatemanager.UpdateManagerConstant;
 
 public class MainActivity extends AppCompatActivity {
 
+    // Declare the UpdateManager
+    UpdateManager mUpdateManager;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
 
-        UpdateManager.Builder().mode(UpdateManagerConstant.IMMEDIATE).start(this);
+        TextView txtCurrentVersion = findViewById(R.id.txt_current_version);
+        TextView txtAvailableVersion = findViewById(R.id.txt_available_version);
+
+        txtCurrentVersion.setText(String.valueOf(BuildConfig.VERSION_CODE));
+
+        // Initialize the Update Manager with the Activity and the Update Mode
+        mUpdateManager = UpdateManager.Builder(this);
+
+        // Callback from Available version code
+        mUpdateManager.getAvailableVersionCode(new onVersionCheckListener() {
+            @Override
+            public void onReceiveVersionCode(final int code) {
+                txtAvailableVersion.setText(String.valueOf(code));
+            }
+        });
 
     }
 
     @Override
     protected void onResume() {
         super.onResume();
-        UpdateManager.continueUpdate(this);
+        // Continue updates when resumed
+        mUpdateManager.continueUpdate();
+    }
+
+    public void callFlexibleUpdate(View view) {
+        // Start a Flexible Update
+        mUpdateManager.mode(UpdateManagerConstant.FLEXIBLE).start();
+    }
+
+    public void callImmediateUpdate(View view) {
+        // Start a Immediate Update
+        mUpdateManager.mode(UpdateManagerConstant.IMMEDIATE).start();
     }
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 849515d..78a51ec 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,24 +1,97 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/layout_main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".MainActivity"
-    android:id="@+id/layout_main">
+    tools:context=".MainActivity">
 
     <LinearLayout
-        android:layout_centerInParent="true"
+        android:id="@+id/linearLayout"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:layout_marginTop="120dp"
+        android:gravity="center_horizontal"
         android:orientation="vertical"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/linearLayout2"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <TextView
+            android:id="@+id/txt_available_version"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="40sp"
+            tools:text="25" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Available Version"
+            android:textSize="15sp" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/linearLayout2"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="120dp"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        app:layout_constraintEnd_toStartOf="@+id/linearLayout"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <TextView
-            android:id="@+id/textView"
+            android:id="@+id/txt_current_version"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="In App Update Demo App"
-            android:textSize="25sp" />
+            android:textSize="40sp"
+            tools:text="2" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Current Version"
+            android:textSize="15sp" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:layout_marginEnd="8dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="100dp"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/linearLayout">
+
+        <com.google.android.material.button.MaterialButton
+            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            android:textColor="@color/colorAccent"
+            app:strokeColor="@color/colorAccent"
+            android:layout_width="200dp"
+            android:layout_height="wrap_content"
+            android:text="Flexible Update"
+            android:layout_margin="10dp"
+            android:onClick="callFlexibleUpdate" />
+
+        <com.google.android.material.button.MaterialButton
+            android:backgroundTint="@color/colorAccent"
+            android:layout_width="200dp"
+            android:layout_height="wrap_content"
+            android:text="Immediate Update"
+            android:layout_margin="10dp"
+            android:onClick="callImmediateUpdate" />
 
     </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9513160..e18f895 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light">
+    <style name="AppTheme" parent="Theme.MaterialComponents.Light">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
diff --git a/images/gif/flexible_update.gif b/images/gif/flexible_update.gif
new file mode 100644
index 0000000..8b1074f
Binary files /dev/null and b/images/gif/flexible_update.gif differ
diff --git a/images/gif/immediate_update.gif b/images/gif/immediate_update.gif
new file mode 100644
index 0000000..61b11b7
Binary files /dev/null and b/images/gif/immediate_update.gif differ
diff --git a/images/home.png b/images/home.png
new file mode 100644
index 0000000..3e8c815
Binary files /dev/null and b/images/home.png differ
diff --git a/images/update_flexible.png b/images/update_flexible.png
new file mode 100644
index 0000000..6abca34
Binary files /dev/null and b/images/update_flexible.png differ
diff --git a/images/update_immediate.png b/images/update_immediate.png
new file mode 100644
index 0000000..c2f7d2e
Binary files /dev/null and b/images/update_immediate.png differ
diff --git a/updatemanager/src/main/java/com/sanojpunchihewa/updatemanager/UpdateManager.java b/updatemanager/src/main/java/com/sanojpunchihewa/updatemanager/UpdateManager.java
index 2567797..a8dfc0f 100644
--- a/updatemanager/src/main/java/com/sanojpunchihewa/updatemanager/UpdateManager.java
+++ b/updatemanager/src/main/java/com/sanojpunchihewa/updatemanager/UpdateManager.java
@@ -17,10 +17,13 @@
 import com.google.android.play.core.install.model.UpdateAvailability;
 import com.google.android.play.core.tasks.OnSuccessListener;
 import com.google.android.play.core.tasks.Task;
+import java.lang.ref.WeakReference;
 
 public class UpdateManager {
 
-    private static final String TAG = "InUpdateManager";
+    private static final String TAG = "InAppUpdateManager";
+
+    private WeakReference<Activity> mActivityWeakReference;
 
     private static UpdateManager instance;
 
@@ -33,11 +36,15 @@ public class UpdateManager {
     // Returns an intent object that you use to check for an update.
     private Task<AppUpdateInfo> appUpdateInfoTask;
 
-    private int availableVersionCode = 0;
+    private UpdateManager(Activity activity) {
+        mActivityWeakReference = new WeakReference<>(activity);
+        this.appUpdateManager = AppUpdateManagerFactory.create(getActivity());
+        this.appUpdateInfoTask = appUpdateManager.getAppUpdateInfo();
+    }
 
-    public static UpdateManager Builder() {
+    public static UpdateManager Builder(Activity activity) {
         if (instance == null) {
-            instance = new UpdateManager();
+            instance = new UpdateManager(activity);
         }
         Log.d(TAG, "Instance created");
         return instance;
@@ -50,16 +57,14 @@ public UpdateManager mode(int mode) {
         return this;
     }
 
-    public void start(Activity activity) {
-        this.appUpdateManager = AppUpdateManagerFactory.create(activity);
-        this.appUpdateInfoTask = appUpdateManager.getAppUpdateInfo();
+    public void start() {
         if (mode == FLEXIBLE) {
-            setUpListener(activity);
+            setUpListener();
         }
-        checkUpdate(activity);
+        checkUpdate();
     }
 
-    private void checkUpdate(final Activity activity) {
+    private void checkUpdate() {
         // Checks that the platform will allow the specified type of update.
         Log.d(TAG, "Checking for updates");
         appUpdateInfoTask.addOnSuccessListener(new OnSuccessListener<AppUpdateInfo>() {
@@ -69,8 +74,7 @@ public void onSuccess(AppUpdateInfo appUpdateInfo) {
                         && appUpdateInfo.isUpdateTypeAllowed(mode)) {
                     // Request the update.
                     Log.d(TAG, "Update available");
-                    availableVersionCode = appUpdateInfo.availableVersionCode();
-                    startUpdate(activity, appUpdateInfo);
+                    startUpdate(appUpdateInfo);
                 } else {
                     Log.d(TAG, "No Update available");
                 }
@@ -78,13 +82,13 @@ public void onSuccess(AppUpdateInfo appUpdateInfo) {
         });
     }
 
-    private void startUpdate(Activity activity, AppUpdateInfo appUpdateInfo) {
+    private void startUpdate(AppUpdateInfo appUpdateInfo) {
         try {
             Log.d(TAG, "Starting update");
             appUpdateManager.startUpdateFlowForResult(
                     appUpdateInfo,
                     mode,
-                    activity,
+                    getActivity(),
                     UpdateManagerConstant.REQUEST_CODE);
         } catch (IntentSender.SendIntentException e) {
             Log.d(TAG, e.getMessage());
@@ -103,7 +107,7 @@ private void startUpdate(Activity activity, AppUpdateInfo appUpdateInfo) {
 //        }
 //    }
 
-    private void setUpListener(final Activity activity) {
+    private void setUpListener() {
         InstallStateUpdatedListener listener = new InstallStateUpdatedListener() {
             @Override
             public void onStateUpdate(InstallState installState) {
@@ -111,22 +115,22 @@ public void onStateUpdate(InstallState installState) {
                     // After the update is downloaded, show a notification
                     // and request user confirmation to restart the app.
                     Log.d(TAG, "An update has been downloaded");
-                    popupSnackbarForCompleteUpdate(activity);
+                    popupSnackbarForCompleteUpdate();
                 }
             }
         };
         appUpdateManager.registerListener(listener);
     }
 
-    public static void continueUpdate(final Activity activity) {
+    public void continueUpdate() {
         if (instance.mode == FLEXIBLE) {
-            continueUpdateForFlexible(activity);
+            continueUpdateForFlexible();
         } else {
-            continueUpdateForImmediate(activity);
+            continueUpdateForImmediate();
         }
     }
 
-    private static void continueUpdateForFlexible(final Activity activity) {
+    private void continueUpdateForFlexible() {
         instance.appUpdateManager
                 .getAppUpdateInfo()
                 .addOnSuccessListener(new OnSuccessListener<AppUpdateInfo>() {
@@ -136,13 +140,13 @@ public void onSuccess(AppUpdateInfo appUpdateInfo) {
                         // notify the user to complete the update.
                         if (appUpdateInfo.installStatus() == InstallStatus.DOWNLOADED) {
                             Log.d(TAG, "An update has been downloaded");
-                            instance.popupSnackbarForCompleteUpdate(activity);
+                            instance.popupSnackbarForCompleteUpdate();
                         }
                     }
                 });
     }
 
-    private static void continueUpdateForImmediate(final Activity activity) {
+    private void continueUpdateForImmediate() {
         instance.appUpdateManager
                 .getAppUpdateInfo()
                 .addOnSuccessListener(new OnSuccessListener<AppUpdateInfo>() {
@@ -155,7 +159,7 @@ public void onSuccess(AppUpdateInfo appUpdateInfo) {
                                 instance.appUpdateManager.startUpdateFlowForResult(
                                         appUpdateInfo,
                                         instance.mode,
-                                        activity,
+                                        getActivity(),
                                         UpdateManagerConstant.REQUEST_CODE);
                             } catch (IntentSender.SendIntentException e) {
                                 Log.d(TAG, e.getMessage());
@@ -165,10 +169,10 @@ public void onSuccess(AppUpdateInfo appUpdateInfo) {
                 });
     }
 
-    private void popupSnackbarForCompleteUpdate(Activity activity) {
+    private void popupSnackbarForCompleteUpdate() {
         Snackbar snackbar =
                 Snackbar.make(
-                        activity.getWindow().getDecorView().findViewById(android.R.id.content),
+                        getActivity().getWindow().getDecorView().findViewById(android.R.id.content),
                         "An update has just been downloaded.",
                         Snackbar.LENGTH_INDEFINITE);
         snackbar.setAction("RESTART", new View.OnClickListener() {
@@ -179,4 +183,30 @@ public void onClick(View v) {
         });
         snackbar.show();
     }
+
+    public void getAvailableVersionCode(final onVersionCheckListener onVersionCheckListener) {
+        appUpdateInfoTask.addOnSuccessListener(new OnSuccessListener<AppUpdateInfo>() {
+            @Override
+            public void onSuccess(AppUpdateInfo appUpdateInfo) {
+                if (appUpdateInfo.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE) {
+                    // Request the update.
+                    Log.d(TAG, "Update available");
+                    int availableVersionCode = appUpdateInfo.availableVersionCode();
+                    onVersionCheckListener.onReceiveVersionCode(availableVersionCode);
+                } else {
+                    Log.d(TAG, "No Update available");
+                }
+            }
+        });
+    }
+
+    private Activity getActivity() {
+        return mActivityWeakReference.get();
+    }
+
+    public interface onVersionCheckListener {
+
+        void onReceiveVersionCode(int code);
+    }
+
 }