diff --git a/CHANGELOG.md b/CHANGELOG.md
index db4f30c..e4afe6b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,7 @@
 
+### Version 2.4.4
+  * Updated to Extensions SDK 2.3.3
+
 ### Version 2.4.3
   * Added HeartBeat Metric.
   * Returns each unique row from the values returned from a query.
diff --git a/README.md b/README.md
index 36c3938..313efc4 100644
--- a/README.md
+++ b/README.md
@@ -451,8 +451,8 @@ Always feel free to fork and contribute any changes directly via [GitHub](https:
 ## Version
 |          Name            |  Version   |
 |--------------------------|------------|
-|Extension Version         |2.4.3       |
+|Extension Version         |2.4.4       |
 |Controller Compatibility  |3.7 or Later|
 |Product Tested On         |OracleDB |
-|Last Update               |04/04/2018 |
+|Last Update               |05/13/2020 |
 |List of Changes           |[Change log](https://github.com/Appdynamics/oracle-monitoring-extension/blob/master/CHANGELOG.md) |
diff --git a/pom.xml b/pom.xml
index 9ce7a82..0c5eea3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,45 +15,27 @@
 
     <groupId>com.appdynamics.extensions</groupId>
     <artifactId>oracledb-monitoring-extension</artifactId>
-    <version>2.4.3</version>
+    <version>2.4.4</version>
     <packaging>jar</packaging>
     <name>oracle-monitoring-extension</name>
     <url>http://maven.apache.org</url>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
         <target.dir>${project.build.directory}/OracleDBMonitor</target.dir>
         <lib.dir>${basedir}/lib</lib.dir>
     </properties>
-
-
     <dependencies>
         <dependency>
             <groupId>com.appdynamics</groupId>
-            <artifactId>machine-agent</artifactId>
-            <version>3.7.11</version>
+            <artifactId>machineagent-repackaged</artifactId>
+            <version>4.0.5.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.appdynamics</groupId>
             <artifactId>appd-exts-commons</artifactId>
-            <version>2.0.1</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.9</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.0.4</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>18.0</version>
+            <version>2.2.3</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
@@ -61,55 +43,12 @@
             <version>4.11</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.3.2</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>2.4</version>
-        </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>18.0</version>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.17</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <version>1.7.21</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
-            <version>1.13</version>
-        </dependency>
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.38</version>
-        </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-api-mockito</artifactId>
             <version>1.4.7</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.3.5</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.powermock</groupId>
             <artifactId>powermock-module-junit4</artifactId>
@@ -117,7 +56,6 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
     <build>
         <finalName>${project.artifactId}</finalName>
         <resources>
@@ -250,5 +188,4 @@
     <scm>
         <connection>scm:https://github.com/Appdynamics/oracle-monitoring-extension.git</connection>
     </scm>
-
 </project>
\ No newline at end of file
diff --git a/src/main/java/com/appdynamics/extensions/oracledb/ColumnGenerator.java b/src/main/java/com/appdynamics/extensions/oracledb/ColumnGenerator.java
index 112e06f..1d75644 100644
--- a/src/main/java/com/appdynamics/extensions/oracledb/ColumnGenerator.java
+++ b/src/main/java/com/appdynamics/extensions/oracledb/ColumnGenerator.java
@@ -9,9 +9,9 @@
 package com.appdynamics.extensions.oracledb;
 
 import com.appdynamics.extensions.util.AssertUtils;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Strings;
 import com.google.common.collect.Maps;
-import org.codehaus.jackson.map.ObjectMapper;
 
 import java.util.List;
 import java.util.Map;
diff --git a/src/main/java/com/appdynamics/extensions/oracledb/JDBCConnectionAdapter.java b/src/main/java/com/appdynamics/extensions/oracledb/JDBCConnectionAdapter.java
index a7c0d83..aef5de6 100644
--- a/src/main/java/com/appdynamics/extensions/oracledb/JDBCConnectionAdapter.java
+++ b/src/main/java/com/appdynamics/extensions/oracledb/JDBCConnectionAdapter.java
@@ -9,8 +9,8 @@
 package com.appdynamics.extensions.oracledb;
 
 
+import com.appdynamics.extensions.logging.ExtensionsLoggerFactory;
 import com.google.common.base.Strings;
-import org.slf4j.LoggerFactory;
 
 import java.sql.*;
 import java.util.Map;
@@ -21,7 +21,7 @@ public class JDBCConnectionAdapter {
 
     private final String connUrl;
     private final Map<String, String> connectionProperties;
-    private static final org.slf4j.Logger logger = LoggerFactory.getLogger(JDBCConnectionAdapter.class);
+    private static final org.slf4j.Logger logger = ExtensionsLoggerFactory.getLogger(JDBCConnectionAdapter.class);
 
 
     private JDBCConnectionAdapter(String connStr, Map<String, String> connectionProperties) {
diff --git a/src/main/java/com/appdynamics/extensions/oracledb/MetricCollector.java b/src/main/java/com/appdynamics/extensions/oracledb/MetricCollector.java
index 808eea8..df4f055 100644
--- a/src/main/java/com/appdynamics/extensions/oracledb/MetricCollector.java
+++ b/src/main/java/com/appdynamics/extensions/oracledb/MetricCollector.java
@@ -8,12 +8,11 @@
 
 package com.appdynamics.extensions.oracledb;
 
+import com.appdynamics.extensions.logging.ExtensionsLoggerFactory;
 import com.appdynamics.extensions.metrics.Metric;
-import org.slf4j.LoggerFactory;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -27,7 +26,7 @@ public class MetricCollector {
     private String dbServerDisplayName;
     private String queryDisplayName;
     private List<Map<String, String>> metricReplacer;
-    private static final org.slf4j.Logger logger = LoggerFactory.getLogger(MetricCollector.class);
+    private static final org.slf4j.Logger logger = ExtensionsLoggerFactory.getLogger(MetricCollector.class);
 
 
     public MetricCollector(String metricPrefix, String dbServerDisplayName, String queryDisplayName, List<Map<String, String>> metricReplacer) {
diff --git a/src/main/java/com/appdynamics/extensions/oracledb/OracledbMonitor.java b/src/main/java/com/appdynamics/extensions/oracledb/OracledbMonitor.java
index 3f8eaf0..1225c77 100644
--- a/src/main/java/com/appdynamics/extensions/oracledb/OracledbMonitor.java
+++ b/src/main/java/com/appdynamics/extensions/oracledb/OracledbMonitor.java
@@ -9,36 +9,28 @@
 package com.appdynamics.extensions.oracledb;
 
 import com.appdynamics.extensions.ABaseMonitor;
-import com.appdynamics.extensions.TaskInputArgs;
+import com.appdynamics.extensions.Constants;
 import com.appdynamics.extensions.TasksExecutionServiceProvider;
-import com.appdynamics.extensions.crypto.CryptoUtil;
+import com.appdynamics.extensions.logging.ExtensionsLoggerFactory;
 import com.appdynamics.extensions.util.AssertUtils;
+import com.appdynamics.extensions.util.CryptoUtils;
 import com.google.common.base.Strings;
 import com.google.common.collect.Maps;
-import com.singularity.ee.agent.systemagent.api.exception.TaskExecutionException;
 import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import static com.appdynamics.extensions.TaskInputArgs.PASSWORD_ENCRYPTED;
 
 /**
  * Created by bhuvnesh.kumar on 1/23/18.
  */
 public class OracledbMonitor extends ABaseMonitor {
 
-    private static final Logger logger = LoggerFactory.getLogger(OracledbMonitor.class);
+    private static final Logger logger = ExtensionsLoggerFactory.getLogger(OracledbMonitor.class);
     private long previousTimestamp = 0;
     private long currentTimestamp = System.currentTimeMillis();
-    private static final String CONFIG_ARG = "config-file";
 
     @Override
     protected String getDefaultMetricPrefix() {
@@ -53,7 +45,7 @@ public String getMonitorName() {
     @Override
     protected void doRun(TasksExecutionServiceProvider serviceProvider) {
 
-        List<Map<String, String>> servers = (List<Map<String, String>>) configuration.getConfigYml().get("dbServers");
+        List<Map<String, String>> servers = (List<Map<String, String>>) getContextConfiguration().getConfigYml().get("dbServers");
 
         previousTimestamp = currentTimestamp;
         currentTimestamp = System.currentTimeMillis();
@@ -70,9 +62,9 @@ protected void doRun(TasksExecutionServiceProvider serviceProvider) {
     }
 
     @Override
-    protected int getTaskCount() {
-        List<Map<String, String>> servers = (List<Map<String, String>>) configuration.getConfigYml().get("dbServers");
-        return servers.size();
+    protected List<Map<String, ?>> getServers() {
+        List<Map<String, ?>> servers = (List<Map<String, ?>>) getContextConfiguration().getConfigYml().get("dbServers");
+        return servers;
     }
 
 
@@ -88,7 +80,7 @@ private OracledbMonitorTask createTask(Map server, TasksExecutionServiceProvider
 
         return new OracledbMonitorTask.Builder()
                 .metricWriter(serviceProvider.getMetricWriteHelper())
-                .metricPrefix(configuration.getMetricPrefix())
+                .metricPrefix(getContextConfiguration().getMetricPrefix())
                 .jdbcAdapter(jdbcAdapter)
                 .previousTimestamp(previousTimestamp)
                 .currentTimestamp(currentTimestamp)
@@ -152,9 +144,9 @@ private String getPassword(Map server, String normal_password) {
 
     private String getEncryptedPassword(String encryptionKey, String encryptedPassword) {
         Map<String, String> cryptoMap = Maps.newHashMap();
-        cryptoMap.put(PASSWORD_ENCRYPTED, encryptedPassword);
-        cryptoMap.put(TaskInputArgs.ENCRYPTION_KEY, encryptionKey);
-        return CryptoUtil.getPassword(cryptoMap);
+        cryptoMap.put(Constants.ENCRYPTED_PASSWORD, encryptedPassword);
+        cryptoMap.put(Constants.ENCRYPTION_KEY, encryptionKey);
+        return CryptoUtils.getPassword(cryptoMap);
     }
 
 
diff --git a/src/main/java/com/appdynamics/extensions/oracledb/OracledbMonitorTask.java b/src/main/java/com/appdynamics/extensions/oracledb/OracledbMonitorTask.java
index 1dabbe8..a5da2b6 100644
--- a/src/main/java/com/appdynamics/extensions/oracledb/OracledbMonitorTask.java
+++ b/src/main/java/com/appdynamics/extensions/oracledb/OracledbMonitorTask.java
@@ -10,8 +10,8 @@
 
 import com.appdynamics.extensions.AMonitorTaskRunnable;
 import com.appdynamics.extensions.MetricWriteHelper;
+import com.appdynamics.extensions.logging.ExtensionsLoggerFactory;
 import com.appdynamics.extensions.metrics.Metric;
-import org.slf4j.LoggerFactory;
 
 import java.sql.Connection;
 import java.sql.ResultSet;
@@ -33,7 +33,7 @@ public class OracledbMonitorTask implements AMonitorTaskRunnable {
     private JDBCConnectionAdapter jdbcAdapter;
     private Map server;
     private Boolean status = true;
-    private static final org.slf4j.Logger logger = LoggerFactory.getLogger(OracledbMonitorTask.class);
+    private static final org.slf4j.Logger logger = ExtensionsLoggerFactory.getLogger(OracledbMonitorTask.class);
 
 
     public void run() {
diff --git a/src/test/java/com/appdynamics/extensions/oracledb/OracledbMonitorTaskTest.java b/src/test/java/com/appdynamics/extensions/oracledb/OracledbMonitorTaskTest.java
index b075667..4eabf36 100644
--- a/src/test/java/com/appdynamics/extensions/oracledb/OracledbMonitorTaskTest.java
+++ b/src/test/java/com/appdynamics/extensions/oracledb/OracledbMonitorTaskTest.java
@@ -24,9 +24,7 @@
 import java.util.List;
 import java.util.Map;
 
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 /**
  * Created by bhuvnesh.kumar on 1/23/18.