diff --git a/gradle.properties b/gradle.properties
index 435022aff..a7c788727 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,9 +12,9 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-aws-advanced-jdbc-wrapper.version.major=2
-aws-advanced-jdbc-wrapper.version.minor=6
-aws-advanced-jdbc-wrapper.version.subminor=5
+aws-advanced-jdbc-wrapper.version.major=3
+aws-advanced-jdbc-wrapper.version.minor=0
+aws-advanced-jdbc-wrapper.version.subminor=0
 snapshot=false
 nexus.publish=true
 
diff --git a/wrapper/src/main/java/software/amazon/jdbc/ConnectionProviderManager.java b/wrapper/src/main/java/software/amazon/jdbc/ConnectionProviderManager.java
index 0f8687930..014acf082 100644
--- a/wrapper/src/main/java/software/amazon/jdbc/ConnectionProviderManager.java
+++ b/wrapper/src/main/java/software/amazon/jdbc/ConnectionProviderManager.java
@@ -48,7 +48,7 @@ public ConnectionProviderManager(
   /**
    * Get the {@link ConnectionProvider} to use to establish a connection using the given driver
    * protocol, host details, and properties. If a non-default ConnectionProvider has been set using
-   * {@link #setConnectionProvider} and {@link ConnectionProvider#acceptsUrl} returns true, the
+   * {@link Driver#setCustomConnectionProvider} and {@link ConnectionProvider#acceptsUrl} returns true, the
    * non-default ConnectionProvider will be returned. Otherwise, the default ConnectionProvider will
    * be returned. See {@link ConnectionProvider#acceptsUrl} for more info.
    *
diff --git a/wrapper/src/main/java/software/amazon/jdbc/hostlistprovider/RdsHostListProvider.java b/wrapper/src/main/java/software/amazon/jdbc/hostlistprovider/RdsHostListProvider.java
index 026d96e4d..cc17096e5 100644
--- a/wrapper/src/main/java/software/amazon/jdbc/hostlistprovider/RdsHostListProvider.java
+++ b/wrapper/src/main/java/software/amazon/jdbc/hostlistprovider/RdsHostListProvider.java
@@ -368,6 +368,7 @@ protected HostSpec createHost(
    * Build a host dns endpoint based on host/node name.
    *
    * @param nodeName A host name.
+   * @param clusterInstanceTemplate A cluster instance template
    * @return Host dns endpoint
    */
   protected String getHostEndpoint(final String nodeName, final HostSpec clusterInstanceTemplate) {
diff --git a/wrapper/src/main/java/software/amazon/jdbc/util/ConnectionUrlParser.java b/wrapper/src/main/java/software/amazon/jdbc/util/ConnectionUrlParser.java
index cd37e2647..b66f631e4 100644
--- a/wrapper/src/main/java/software/amazon/jdbc/util/ConnectionUrlParser.java
+++ b/wrapper/src/main/java/software/amazon/jdbc/util/ConnectionUrlParser.java
@@ -101,6 +101,10 @@ public static HostSpec parseHostPortPair(final String url, final HostRole role,
    * "url:port", for example: "instance-1.XYZ.us-east-2.rds.amazonaws.com:9999"
    * "[region_name]url", for example: "us-east-2:instance-1.any-domain.com"
    * "[region_name]url:port", for example: "us-east-2:instance-1.any-domain.com:9999"
+   *
+   * @param urlWithRegionPrefix Url with region prexix
+   * @param hostSpecBuilderSupplier A host builder supplier
+   * @return A pair of region and HostSpec
    */
   public static Pair<String, HostSpec> parseHostPortPairWithRegionPrefix(
       final String urlWithRegionPrefix,
diff --git a/wrapper/src/main/java/software/amazon/jdbc/util/connection/ConnectionServiceImpl.java b/wrapper/src/main/java/software/amazon/jdbc/util/connection/ConnectionServiceImpl.java
index 8c7b80b3d..540aea280 100644
--- a/wrapper/src/main/java/software/amazon/jdbc/util/connection/ConnectionServiceImpl.java
+++ b/wrapper/src/main/java/software/amazon/jdbc/util/connection/ConnectionServiceImpl.java
@@ -49,6 +49,16 @@ public class ConnectionServiceImpl implements ConnectionService {
   /**
    * Constructs a {@link ConnectionServiceImpl} instance.
    *
+   * @param storageService An instance of storage service
+   * @param monitorService An instance of monitor service
+   * @param telemetryFactory An instance of telemetry factory
+   * @param connectionProvider An instance of connection provider
+   * @param originalUrl An original Url
+   * @param targetDriverProtocol A target driver protocol
+   * @param driverDialect An instance of driver dialect
+   * @param dbDialect An instance of database dialect
+   * @param props Properties
+   * @throws SQLException if errors occurred while creating an instance
    * @deprecated Use {@link software.amazon.jdbc.util.ServiceUtility#createMinimalServiceContainer} instead.
    */
   @Deprecated
diff --git a/wrapper/src/main/java/software/amazon/jdbc/util/monitoring/Monitor.java b/wrapper/src/main/java/software/amazon/jdbc/util/monitoring/Monitor.java
index fbdd55063..78e111d88 100644
--- a/wrapper/src/main/java/software/amazon/jdbc/util/monitoring/Monitor.java
+++ b/wrapper/src/main/java/software/amazon/jdbc/util/monitoring/Monitor.java
@@ -26,6 +26,8 @@ public interface Monitor {
    * Executes the monitoring loop for this monitor. This method should be called in the run() method of the thread
    * submitted during the call to {@link #start()}. Additionally, the monitoring loop should regularly update the last
    * activity timestamp so that the {@link MonitorService} can detect whether the monitor is stuck or not.
+   *
+   * @throws Exception if there's an error executing the monitoring logic.
    */
   void monitor() throws Exception;