diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 9be205f..fe30e00 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -6,12 +6,10 @@ updates:
   # Maintain dependencies for Gradle dependencies
   - package-ecosystem: "gradle"
     directory: "/"
-    target-branch: "next"
     schedule:
       interval: "daily"
   # Maintain dependencies for GitHub Actions
   - package-ecosystem: "github-actions"
     directory: "/"
-    target-branch: "next"
     schedule:
       interval: "daily"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b85af83..40b9f09 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ name: Build
 on:
   # Trigger the workflow on pushes to only the 'main' branch (this avoids duplicate checks being run e.g. for dependabot pull requests)
   push:
-    branches: ['231']
+    branches: ['232']
     # Skip md and SQL files
     paths-ignore:
       - '**/*.md'
@@ -32,15 +32,14 @@ on:
 
 jobs:
 
-  # Run Gradle Wrapper Validation Action to verify the wrapper's checksum
-  # Run verifyPlugin, IntelliJ Plugin Verifier, and test Gradle tasks
-  # Build plugin and provide the artifact for the next workflow jobs
+  # Prepare environment and build the plugin
   build:
     name: Build
     runs-on: ubuntu-latest
     outputs:
       version: ${{ steps.properties.outputs.version }}
       changelog: ${{ steps.properties.outputs.changelog }}
+      pluginVerifierHomeDir: ${{ steps.properties.outputs.pluginVerifierHomeDir }}
     steps:
 
       # Free GitHub Actions Environment Disk Space
@@ -56,15 +55,18 @@ jobs:
 
       # Validate wrapper
       - name: Gradle Wrapper Validation
-        uses: gradle/wrapper-validation-action@v1.0.4
+        uses: gradle/wrapper-validation-action@v1.0.6
 
-      # Setup Java 11 environment for the next steps
+      # Setup Java environment for the next steps
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
           distribution: zulu
-          java-version: 11
-          cache: gradle
+          java-version: 17
+
+      # Setup Gradle
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
 
       # Set environment variables
       - name: Export Properties
@@ -73,22 +75,64 @@ jobs:
         run: |
           PROPERTIES="$(./gradlew properties --console=plain -q)"
           VERSION="$(echo "$PROPERTIES" | grep "^version:" | cut -f2- -d ' ')"
-          NAME="$(echo "$PROPERTIES" | grep "^pluginName:" | cut -f2- -d ' ')"
           CHANGELOG="$(./gradlew getChangelog --unreleased --no-header --console=plain -q)"
-          CHANGELOG="${CHANGELOG//'%'/'%25'}"
-          CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
-          CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
 
-          echo "::set-output name=version::$VERSION"
-          echo "::set-output name=name::$NAME"
-          echo "::set-output name=changelog::$CHANGELOG"
-          echo "::set-output name=pluginVerifierHomeDir::~/.pluginVerifier"
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "pluginVerifierHomeDir=~/.pluginVerifier" >> $GITHUB_OUTPUT
+          
+          echo "changelog<<EOF" >> $GITHUB_OUTPUT
+          echo "$CHANGELOG" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
 
           ./gradlew listProductsReleases # prepare list of IDEs for Plugin Verifier
 
+      # Build plugin
+      - name: Build plugin
+        run: ./gradlew buildPlugin
+
+      # Prepare plugin archive content for creating artifact
+      - name: Prepare Plugin Artifact
+        id: artifact
+        shell: bash
+        run: |
+          cd ${{ github.workspace }}/build/distributions
+          FILENAME=`ls *.zip`
+          unzip "$FILENAME" -d content
+
+          echo "filename=${FILENAME:0:-4}" >> $GITHUB_OUTPUT
+
+      # Store already-built plugin as an artifact for downloading
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: ${{ steps.artifact.outputs.filename }}
+          path: ./build/distributions/content/*/*
+
+  # Run tests and upload a code coverage report
+  test:
+    name: Test
+    needs: [ build ]
+    runs-on: ubuntu-latest
+    steps:
+
+      # Check out current repository
+      - name: Fetch Sources
+        uses: actions/checkout@v3
+
+      # Setup Java environment for the next steps
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: zulu
+          java-version: 17
+
+      # Setup Gradle
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+
       # Run tests
       - name: Run Tests
-        run: ./gradlew test
+        run: ./gradlew check
 
       # Collect Tests Result of failed tests
       - name: Collect Tests Result
@@ -98,16 +142,72 @@ jobs:
           name: tests-result
           path: ${{ github.workspace }}/build/reports/tests
 
+      # Upload Kover report to CodeCov
+      - name: Upload Code Coverage Report
+        uses: codecov/codecov-action@v3
+        with:
+          files: ${{ github.workspace }}/build/reports/kover/xml/report.xml
+
+  # Run Qodana inspections and provide report
+  inspectCode:
+    name: Inspect code
+    needs: [ build ]
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      checks: write
+      pull-requests: write
+    steps:
+
+      # Check out current repository
+      - name: Fetch Sources
+        uses: actions/checkout@v3
+
+      # Setup Java environment for the next steps
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: zulu
+          java-version: 17
+
+      # Run Qodana inspections
+      - name: Qodana - Code Inspection
+        uses: JetBrains/qodana-action@v2023.1.5
+        with:
+          cache-default-branch-only: true
+
+  # Run plugin structure verification along with IntelliJ Plugin Verifier
+  verify:
+    name: Verify plugin
+    needs: [ build, test, inspectCode ]
+    runs-on: ubuntu-latest
+    steps:
+
+      # Check out current repository
+      - name: Fetch Sources
+        uses: actions/checkout@v3
+
+      # Setup Java environment for the next steps
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: zulu
+          java-version: 17
+
+      # Setup Gradle
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+
       # Cache Plugin Verifier IDEs
       - name: Setup Plugin Verifier IDEs Cache
         uses: actions/cache@v3
         with:
-          path: ${{ steps.properties.outputs.pluginVerifierHomeDir }}/ides
+          path: ${{ needs.build.outputs.pluginVerifierHomeDir }}/ides
           key: plugin-verifier-${{ hashFiles('build/listProductsReleases.txt') }}
 
       # Run Verify Plugin task and IntelliJ Plugin Verifier tool
       - name: Run Plugin Verification tasks
-        run: ./gradlew runPluginVerifier -Pplugin.verifier.home.dir=${{ steps.properties.outputs.pluginVerifierHomeDir }}
+        run: ./gradlew runPluginVerifier -Dplugin.verifier.home.dir=${{ needs.build.outputs.pluginVerifierHomeDir }}
 
       # Collect Plugin Verifier Result
       - name: Collect Plugin Verifier Result
@@ -117,34 +217,12 @@ jobs:
           name: pluginVerifier-result
           path: ${{ github.workspace }}/build/reports/pluginVerifier
 
-      # Run Qodana inspections
-      #- name: Qodana - Code Inspection
-      #  uses: JetBrains/qodana-action@v2022.2.1
-
-      # Prepare plugin archive content for creating artifact
-      - name: Prepare Plugin Artifact
-        id: artifact
-        shell: bash
-        run: |
-          cd ${{ github.workspace }}/build/distributions
-          FILENAME=`ls *.zip`
-          unzip "$FILENAME" -d content
-
-          echo "::set-output name=filename::${FILENAME:0:-4}"
-
-      # Store already-built plugin as an artifact for downloading
-      - name: Upload artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ steps.artifact.outputs.filename }}
-          path: ./build/distributions/content/*/*
-
   # Prepare a draft release for GitHub Releases page for the manual verification
   # If accepted and published, release workflow would be triggered
   releaseDraft:
-    name: Release Draft
+    name: Release draft
     if: github.event_name != 'pull_request'
-    needs: build
+    needs: [ build, verify ]
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -154,7 +232,14 @@ jobs:
       - name: Fetch Sources
         uses: actions/checkout@v3
 
-      # Remove old release drafts by using the curl request for the available releases with draft flag
+      # Setup Java environment for the next steps
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: zulu
+          java-version: 17
+
+      # Remove old release drafts by using the curl request for the available releases with a draft flag
       - name: Remove Old Release Drafts
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -163,7 +248,7 @@ jobs:
             --jq '.[] | select(.draft == true) | .id' \
             | xargs -I '{}' gh api -X DELETE repos/{owner}/{repo}/releases/{}
 
-      # Create new release draft - which is not publicly visible and requires manual acceptance
+      # Create a new release draft which is not publicly visible and requires manual acceptance
       - name: Create Release Draft
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 22305ad..3ddd498 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,97 +1,63 @@
-# GitHub Actions Workflow created for handling the release process based on the draft release prepared
-# with the Build workflow. Running the publishPlugin task requires the PUBLISH_TOKEN secret provided.
-
-name: Release
+# GitHub Actions Workflow for launching UI tests on Linux, Windows, and Mac in the following steps:
+# - prepare and launch IDE with your plugin and robot-server plugin, which is needed to interact with UI
+# - wait for IDE to start
+# - run UI tests with separate Gradle task
+#
+# Please check https://github.com/JetBrains/intellij-ui-test-robot for information about UI tests with IntelliJ Platform
+#
+# Workflow is triggered manually.
+
+name: Run UI Tests
 on:
-  release:
-    types: [prereleased, released]
+  workflow_dispatch
 
 jobs:
 
-  # Prepare and publish the plugin to the Marketplace repository
-  release:
-    name: Publish Plugin
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
+  testUI:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - os: ubuntu-latest
+            runIde: |
+              export DISPLAY=:99.0
+              Xvfb -ac :99 -screen 0 1920x1080x16 &
+              gradle runIdeForUiTests &
+          - os: windows-latest
+            runIde: start gradlew.bat runIdeForUiTests
+          - os: macos-latest
+            runIde: ./gradlew runIdeForUiTests &
+
     steps:
 
       # Check out current repository
       - name: Fetch Sources
         uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.release.tag_name }}
 
-      # Setup Java 11 environment for the next steps
+      # Setup Java environment for the next steps
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
           distribution: zulu
-          java-version: 11
-
-      # Set environment variables
-      - name: Export Properties
-        id: properties
-        shell: bash
-        run: |
-          CHANGELOG="$(cat << 'EOM' | sed -e 's/^[[:space:]]*$//g' -e '/./,$!d'
-          ${{ github.event.release.body }}
-          EOM
-          )"
-          
-          CHANGELOG="${CHANGELOG//'%'/'%25'}"
-          CHANGELOG="${CHANGELOG//$'\n'/'%0A'}"
-          CHANGELOG="${CHANGELOG//$'\r'/'%0D'}"
-
-          echo "::set-output name=changelog::$CHANGELOG"
+          java-version: 17
 
-      # Update Unreleased section with the current release note
-      - name: Patch Changelog
-        if: ${{ steps.properties.outputs.changelog != '' }}
-        env:
-          CHANGELOG: ${{ steps.properties.outputs.changelog }}
-        run: |
-          ./gradlew patchChangelog --release-note="$CHANGELOG"
+      # Setup Gradle
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
 
-      # Publish the plugin to the Marketplace
-      - name: Publish Plugin
-        env:
-          PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
-          CERTIFICATE_CHAIN: ${{ secrets.CERTIFICATE_CHAIN }}
-          PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
-          PRIVATE_KEY_PASSWORD: ${{ secrets.PRIVATE_KEY_PASSWORD }}
-        run: ./gradlew publishPlugin
+      # Run IDEA prepared for UI testing
+      - name: Run IDE
+        run: ${{ matrix.runIde }}
 
-      # Upload artifact as a release asset
-      - name: Upload Release Asset
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: gh release upload ${{ github.event.release.tag_name }} ./build/distributions/*
-
-      # Create pull request
-      - name: Create Pull Request
-        if: ${{ steps.properties.outputs.changelog != '' }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          VERSION="${{ github.event.release.tag_name }}"
-          BRANCH="changelog-update-$VERSION"
-
-          git config user.email "action@github.com"
-          git config user.name "GitHub Action"
-
-          git checkout -b $BRANCH
-          git commit -am "Changelog update - $VERSION"
-          git push --set-upstream origin $BRANCH
-
-          gh label create "Release Changelog" \
-            --description "Tag for Pull Request from Release Changelog" \
-            --color 0075ca \
-            --force
+      # Wait for IDEA to be started
+      - name: Health Check
+        uses: jtalk/url-health-check-action@v3
+        with:
+          url: http://127.0.0.1:8082
+          max-attempts: 15
+          retry-delay: 30s
 
-          gh pr create \
-            --title "Changelog update - \`$VERSION\`" \
-            --body "Current pull request contains patched \`CHANGELOG.md\` file for the \`$VERSION\` version." \
-            --head $BRANCH \
-            --label "Release Changelog"
+      # Run tests
+      - name: Tests
+        run: ./gradlew test
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 62a34db..ce1c62c 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,15 +4,10 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="delegatedBuild" value="true" />
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="temurin-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/java" />
           </set>
         </option>
       </GradleProjectSettings>
diff --git a/.run/Run IDE for UI Tests.run.xml b/.run/Run IDE for UI Tests.run.xml
deleted file mode 100644
index 0095f83..0000000
--- a/.run/Run IDE for UI Tests.run.xml	
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run IDE for UI Tests" type="GradleRunConfiguration" factoryName="Gradle">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log" />
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value="runIdeForUiTests" />
-        </list>
-      </option>
-      <option name="vmOptions" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.run/Run IDE with Plugin.run.xml b/.run/Run IDE with Plugin.run.xml
deleted file mode 100644
index d15ff68..0000000
--- a/.run/Run IDE with Plugin.run.xml	
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run Plugin" type="GradleRunConfiguration" factoryName="Gradle">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log" />
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value="runIde" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.run/Run Plugin Tests.run.xml b/.run/Run Plugin Tests.run.xml
deleted file mode 100644
index ae9ae13..0000000
--- a/.run/Run Plugin Tests.run.xml	
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run Tests" type="GradleRunConfiguration" factoryName="Gradle">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log" />
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value="test" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
-  </configuration>
-</component>
diff --git a/.run/Run Plugin Verification.run.xml b/.run/Run Plugin Verification.run.xml
deleted file mode 100644
index b3b4eb8..0000000
--- a/.run/Run Plugin Verification.run.xml	
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run Verifications" type="GradleRunConfiguration" factoryName="Gradle">
-    <log_file alias="idea.log" path="$PROJECT_DIR$/build/idea-sandbox/system/log/idea.log" />
-    <ExternalSystemSettings>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list>
-          <option value="runPluginVerifier" />
-        </list>
-      </option>
-      <option name="vmOptions" value="" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.run/Run Qodana.run.xml b/.run/Run Qodana.run.xml
deleted file mode 100644
index 9603583..0000000
--- a/.run/Run Qodana.run.xml	
+++ /dev/null
@@ -1,26 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run Qodana" type="GradleRunConfiguration" factoryName="Gradle">
-    <ExternalSystemSettings>
-      <option name="env">
-        <map>
-          <entry key="QODANA_SHOW_REPORT" value="true" />
-        </map>
-      </option>
-      <option name="executionName" />
-      <option name="externalProjectPath" value="$PROJECT_DIR$" />
-      <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="cleanInspections runInspections" />
-      <option name="taskDescriptions">
-        <list />
-      </option>
-      <option name="taskNames">
-        <list />
-      </option>
-      <option name="vmOptions" />
-    </ExternalSystemSettings>
-    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
-    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
-    <DebugAllEnabled>false</DebugAllEnabled>
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e921191..e3cd02e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,15 @@
 
 ## Unreleased
 
+### Maintenance
+
+- Project template
+- Update dependencies
+
+### Bugfixes
+
+- Fix does not load the latest function [#107](https://github.com/ng-galien/idea-plpgdebugger/issues/107)
+
 ## 231.0.1 - 2023-05-09
 
 ### Bugfixes
diff --git a/build.gradle.kts b/build.gradle.kts
index a4433c7..26502e7 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,19 +1,16 @@
 import org.jetbrains.changelog.Changelog
 import org.jetbrains.changelog.markdownToHTML
 
-fun properties(key: String) = project.findProperty(key).toString()
+fun properties(key: String) = providers.gradleProperty(key)
+fun environment(key: String) = providers.environmentVariable(key)
 
 plugins {
-    // Java support
-    java
-    // Kotlin support
-    kotlin("jvm") version "1.7.21"
-    // Gradle IntelliJ Plugin
-    id("org.jetbrains.intellij") version "1.12.0"
-    // Gradle Changelog Plugin
-    id("org.jetbrains.changelog") version "2.0.0"
-    // Gradle Qodana Plugin
-    id("org.jetbrains.qodana") version "0.1.13"
+    id("java") // Java support
+    alias(libs.plugins.kotlin) // Kotlin support
+    alias(libs.plugins.gradleIntelliJPlugin) // Gradle IntelliJ Plugin
+    alias(libs.plugins.changelog) // Gradle Changelog Plugin
+    alias(libs.plugins.qodana) // Gradle Qodana Plugin
+    alias(libs.plugins.kover) // Gradle Kover Plugin
 }
 
 group = properties("pluginGroup")
@@ -26,6 +23,16 @@ repositories {
 
 dependencies {
 
+    // Postgres
+    implementation(libs.postgres)
+    // JDBI
+    implementation(libs.jdbi3Core)
+    implementation(libs.jdbi3Kotlin)
+    implementation(libs.jdbi3Postgres)
+    // Arrow
+    testImplementation(libs.arrowCore)
+    testImplementation(libs.arrowFxCoroutines)
+
     // Kotlin and logging
     testImplementation(kotlin("test"))
     testImplementation(kotlin("reflect"))
@@ -41,8 +48,9 @@ dependencies {
     testRuntimeOnly("org.junit.vintage:junit-vintage-engine:5.9.1")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.1")
     // Postgres container and driver
-    testImplementation("org.testcontainers:testcontainers:1.17.6")
-    testImplementation("org.testcontainers:junit-jupiter:1.17.6")
+    testImplementation(libs.testcontainers)
+    testImplementation(libs.testcontainersJunitJupiter)
+
     testImplementation("org.jdbi:jdbi3-kotlin:3.34.0")
     testImplementation("org.jdbi:jdbi3-kotlin-sqlobject:3.34.0")
     testImplementation("org.postgresql:postgresql:42.5.1")
@@ -54,65 +62,79 @@ dependencies {
 }
 
 kotlin {
-    jvmToolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
-    }
+    jvmToolchain(17)
 }
 
-// Configure Gradle IntelliJ Plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin
+// Configure Gradle IntelliJ Plugin - read more: https://plugins.jetbrains.com/docs/intellij/tools-gradle-intellij-plugin.html
 intellij {
-    pluginName.set(properties("pluginName"))
-    version.set(properties("platformVersion"))
-    type.set(properties("platformType"))
+    pluginName = properties("pluginName")
+    version = properties("platformVersion")
+    type = properties("platformType")
 
     // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file.
-    plugins.set(properties("platformPlugins").split(',').map(String::trim).filter(String::isNotEmpty))
+    plugins = properties("platformPlugins").map { it.split(',').map(String::trim).filter(String::isNotEmpty) }
 }
 
+
 // Configure Gradle Changelog Plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
 changelog {
-    version.set(properties("pluginVersion"))
-    groups.set(emptyList())
+    groups.empty()
+    repositoryUrl = properties("pluginRepositoryUrl")
 }
 
 // Configure Gradle Qodana Plugin - read more: https://github.com/JetBrains/gradle-qodana-plugin
 qodana {
-    cachePath.set(projectDir.resolve(".qodana").canonicalPath)
-    reportPath.set(projectDir.resolve("build/reports/inspections").canonicalPath)
-    saveReport.set(true)
-    showReport.set(System.getenv("QODANA_SHOW_REPORT")?.toBoolean() ?: false)
+    cachePath = provider { file(".qodana").canonicalPath }
+    reportPath = provider { file("build/reports/inspections").canonicalPath }
+    saveReport = true
+    showReport = environment("QODANA_SHOW_REPORT").map { it.toBoolean() }.getOrElse(false)
+}
+
+// Configure Gradle Kover Plugin - read more: https://github.com/Kotlin/kotlinx-kover#configuration
+koverReport {
+    defaults {
+        xml {
+            onCheck = true
+        }
+    }
 }
 
 tasks {
 
     wrapper {
-        gradleVersion = properties("gradleVersion")
+        gradleVersion = properties("gradleVersion").get()
     }
 
     patchPluginXml {
-        version.set(properties("pluginVersion"))
-        sinceBuild.set(properties("pluginSinceBuild"))
-        untilBuild.set(properties("pluginUntilBuild"))
+        version = properties("pluginVersion")
+        sinceBuild = properties("pluginSinceBuild")
+        untilBuild = properties("pluginUntilBuild")
 
         // Extract the <!-- Plugin description --> section from README.md and provide for the plugin's manifest
-        pluginDescription.set(
-            projectDir.resolve("README.md").readText().lines().run {
-                val start = "<!-- Plugin description -->"
-                val end = "<!-- Plugin description end -->"
+        pluginDescription = providers.fileContents(layout.projectDirectory.file("README.md")).asText.map {
+            val start = "<!-- Plugin description -->"
+            val end = "<!-- Plugin description end -->"
 
+            with (it.lines()) {
                 if (!containsAll(listOf(start, end))) {
                     throw GradleException("Plugin description section not found in README.md:\n$start ... $end")
                 }
-                subList(indexOf(start) + 1, indexOf(end))
-            }.joinToString("\n").run { markdownToHTML(this) }
-        )
+                subList(indexOf(start) + 1, indexOf(end)).joinToString("\n").let(::markdownToHTML)
+            }
+        }
 
+        val changelog = project.changelog // local variable for configuration cache compatibility
         // Get the latest available change notes from the changelog file
-        changeNotes.set(provider {
-            changelog.renderItem(changelog.run {
-                getOrNull(properties("pluginVersion")) ?: getLatest()
-            }, Changelog.OutputType.HTML)
-        })
+        changeNotes = properties("pluginVersion").map { pluginVersion ->
+            with(changelog) {
+                renderItem(
+                    (getOrNull(pluginVersion) ?: getUnreleased())
+                        .withHeader(false)
+                        .withEmptySections(false),
+                    Changelog.OutputType.HTML,
+                )
+            }
+        }
     }
 
     // Configure UI tests plugin
diff --git a/gradle.properties b/gradle.properties
index e445235..ae111fe 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,18 +3,18 @@
 
 pluginGroup = net.plpgsql.ideadebugger
 pluginName = idea-plpgdebugger
+pluginRepositoryUrl = https://github.com/ng-galien/idea-plpgdebugger
 # SemVer format -> https://semver.org
-pluginVersion = 231.0.1
+pluginVersion = 232.0.1
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.
 pluginSinceBuild = 231
-pluginUntilBuild = 231.*
+pluginUntilBuild = 232.*
 
 # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties
 platformType = IU
-
-platformVersion = 2023.1
+platformVersion = 2023.2
 
 
 # Plugin Dependencies -> https://plugins.jetbrains.com/docs/intellij/plugin-dependencies.html
@@ -22,10 +22,16 @@ platformVersion = 2023.1
 platformPlugins = DatabaseTools
 
 # Gradle Releases -> https://github.com/gradle/gradle/releases
-gradleVersion = 7.5.1
+gradleVersion = 8.2.1
 
-# Opt-out flag for bundling Kotlin standard library.
-# See https://plugins.jetbrains.com/docs/intellij/kotlin.html#kotlin-standard-library for details.
-# suppress inspection "UnusedProperty"
+# Opt-out flag for bundling Kotlin standard library -> https://jb.gg/intellij-platform-kotlin-stdlib
 kotlin.stdlib.default.dependency = false
-org.gradle.unsafe.configuration-cache = true
+
+# Enable Gradle Configuration Cache -> https://docs.gradle.org/current/userguide/configuration_cache.html
+org.gradle.configuration-cache = true
+
+# Enable Gradle Build Cache -> https://docs.gradle.org/current/userguide/build_cache.html
+org.gradle.caching = true
+
+# Enable Gradle Kotlin DSL Lazy Property Assignment -> https://docs.gradle.org/current/userguide/kotlin_dsl.html#kotdsl:assignment
+systemProp.org.gradle.unsafe.kotlin.assignment = true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
new file mode 100644
index 0000000..5418a6a
--- /dev/null
+++ b/gradle/libs.versions.toml
@@ -0,0 +1,41 @@
+[versions]
+# libraries
+annotations = "24.0.1"
+
+# plugins
+kotlin = "1.9.0"
+changelog = "2.1.2"
+gradleIntelliJPlugin = "1.15.0"
+qodana = "0.1.13"
+kover = "0.7.2"
+
+arrow = "1.2.0"
+
+testcontainers = "1.18.3"
+
+postgres = "42.6.0"
+
+jbdi3 = "3.39.1"
+
+[libraries]
+
+jdbi3Core = { module = "org.jdbi:jdbi3-core", version.ref = "jbdi3" }
+jdbi3Kotlin = { module = "org.jdbi:jdbi3-kotlin", version.ref = "jbdi3" }
+jdbi3Postgres = { module = "org.jdbi:jdbi3-postgres", version.ref = "jbdi3" }
+
+annotations = { group = "org.jetbrains", name = "annotations", version.ref = "annotations" }
+
+arrowCore = { module = "io.arrow-kt:arrow-core", version.ref = "arrow" }
+arrowFxCoroutines = { module = "io.arrow-kt:arrow-fx-coroutines", version.ref = "arrow" }
+
+postgres = { module = "org.postgresql:postgresql", version.ref = "postgres" }
+
+testcontainers = { module = "org.testcontainers:testcontainers", version.ref = "testcontainers" }
+testcontainersJunitJupiter = { module = "org.testcontainers:junit-jupiter", version.ref = "testcontainers" }
+
+[plugins]
+changelog = { id = "org.jetbrains.changelog", version.ref = "changelog" }
+gradleIntelliJPlugin = { id = "org.jetbrains.intellij", version.ref = "gradleIntelliJPlugin" }
+kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
+kover = { id = "org.jetbrains.kotlinx.kover", version.ref = "kover" }
+qodana = { id = "org.jetbrains.qodana", version.ref = "qodana" }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 41dfb87..9f4197d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/qodana.yml b/qodana.yml
index dac95d3..f388de9 100644
--- a/qodana.yml
+++ b/qodana.yml
@@ -2,5 +2,11 @@
 # https://www.jetbrains.com/help/qodana/qodana-yaml.html
 
 version: 1.0
+linter: jetbrains/qodana-jvm-community:latest
+projectJDK: 17
 profile:
   name: qodana.recommended
+exclude:
+  - name: All
+    paths:
+      - .qodana
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 527b89f..9565815 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -1,11 +1 @@
-rootProject.name = "idea-plpgdebugger"
-include("java")
-
-pluginManagement {
-    repositories {
-        maven {
-            url = uri("https://oss.sonatype.org/content/repositories/snapshots/")
-        }
-        gradlePluginPortal()
-    }
-}
\ No newline at end of file
+rootProject.name = "idea-plpgdebugger"
\ No newline at end of file
diff --git a/src/main/kotlin/net/plpgsql/ideadebugger/run/PlProcess.kt b/src/main/kotlin/net/plpgsql/ideadebugger/run/PlProcess.kt
index 878fc4b..dec5471 100644
--- a/src/main/kotlin/net/plpgsql/ideadebugger/run/PlProcess.kt
+++ b/src/main/kotlin/net/plpgsql/ideadebugger/run/PlProcess.kt
@@ -246,7 +246,7 @@ class PlProcess(
             executor.setInfo("registerBreakpoint: ${breakpoint.fileUrl} => ${breakpoint.line}")
             runReadAction {
                 val path = breakpoint.fileUrl.removePrefix(PlVirtualFileSystem.PROTOCOL_PREFIX)
-                val file = PlVirtualFileSystem.getInstance().findFileByPath(path)
+                val file = PlVirtualFileSystem.Util.getInstance().findFileByPath(path)
                 if (file != null && readyToAcceptBreakPoint()) {
                     addBreakpoint(file, breakpoint)
                 }
@@ -260,7 +260,7 @@ class PlProcess(
             executor.setInfo("unregisterBreakpoint: ${breakpoint.fileUrl} => ${breakpoint.line}")
             runReadAction {
                 val path = breakpoint.fileUrl.removePrefix(PlVirtualFileSystem.PROTOCOL_PREFIX)
-                val file = PlVirtualFileSystem.getInstance().findFileByPath(path)
+                val file = PlVirtualFileSystem.Util.getInstance().findFileByPath(path)
                 if (file != null && readyToAcceptBreakPoint()) {
                     dropBreakpoint(file, breakpoint)
                 }
diff --git a/src/main/kotlin/net/plpgsql/ideadebugger/vfs/PlFunctionSource.kt b/src/main/kotlin/net/plpgsql/ideadebugger/vfs/PlFunctionSource.kt
index ecbf33a..1cd8cdb 100644
--- a/src/main/kotlin/net/plpgsql/ideadebugger/vfs/PlFunctionSource.kt
+++ b/src/main/kotlin/net/plpgsql/ideadebugger/vfs/PlFunctionSource.kt
@@ -19,7 +19,7 @@ import net.plpgsql.ideadebugger.getPlLanguage
 import net.plpgsql.ideadebugger.unquote
 import java.nio.charset.Charset
 
-class PlFunctionSource(project: Project, def: PlApiFunctionDef) : LightVirtualFile(
+class PlFunctionSource(project: Project, def: PlApiFunctionDef, val md5: String) : LightVirtualFile(
     "${def.schema}.${def.name}[${def.oid}]",
     getPlLanguage(),
     def.source
@@ -114,7 +114,7 @@ class PlFunctionSource(project: Project, def: PlApiFunctionDef) : LightVirtualFi
 
     override fun getCharset(): Charset = Charsets.UTF_8
 
-    override fun getFileSystem(): VirtualFileSystem = PlVirtualFileSystem.getInstance()
+    override fun getFileSystem(): VirtualFileSystem = PlVirtualFileSystem.Util.getInstance()
 
     override fun getPath(): String = "$oid"
 
diff --git a/src/main/kotlin/net/plpgsql/ideadebugger/vfs/PlSourceManager.kt b/src/main/kotlin/net/plpgsql/ideadebugger/vfs/PlSourceManager.kt
index 0343e30..22f0a8d 100644
--- a/src/main/kotlin/net/plpgsql/ideadebugger/vfs/PlSourceManager.kt
+++ b/src/main/kotlin/net/plpgsql/ideadebugger/vfs/PlSourceManager.kt
@@ -11,50 +11,54 @@ import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiDocumentManager
 import com.intellij.psi.PsiManager
+import net.plpgsql.ideadebugger.command.PlApiFunctionDef
 import net.plpgsql.ideadebugger.command.PlApiStackFrame
 import net.plpgsql.ideadebugger.command.PlExecutor
 
 class PlSourceManager(private val project: Project, private val executor: PlExecutor) {
 
-    private val vfs = PlVirtualFileSystem.getInstance()
+    private val vfs = PlVirtualFileSystem.Util.getInstance()
 
     fun update(stack: PlApiStackFrame): PlFunctionSource? {
-
-        var virtualFile = runReadAction {
-            vfs.findFileByPath("${stack.oid}")
-        }
-
-        if (virtualFile == null) {
-            val def = executor.getFunctionDef(stack.oid)
-            if (def != null) {
-                virtualFile = vfs.registerNewDefinition(PlFunctionSource(project, def))
+        grabFromDB(stack.oid)?.let { def ->
+            grabFromVFS(def.oid)?.let { vfsFile ->
+                if (!compareMD5(def, vfsFile)) {
+                    updateFileContent(vfsFile, def)
+                }
+            }?: run {
+                vfs.registerNewDefinition(PlFunctionSource(project, def, def.md5))
+            }.let {
+                runInEdt {
+                    FileEditorManager.getInstance(project).openFile(it, true, true)
+                }
             }
         }
+        return vfs.findFileByPath("${stack.oid}")
+    }
 
-        if (virtualFile != null) {
-            runReadAction {
-                PsiManager.getInstance(project).findFile(virtualFile)
-            }?.let { psi ->
-                PsiDocumentManager.getInstance(project).getDocument(psi)?.let { doc ->
-                    if (doc.text != virtualFile.content) {
-                        runInEdt {
-                            runWriteAction {
-                                doc.setText(virtualFile.content)
-                            }
-                        }
+    private fun updateFileContent(vfsFile: PlFunctionSource, def: PlApiFunctionDef) {
+        runReadAction {
+            PsiManager.getInstance(project).findFile(vfsFile)
+        }?.let { psi ->
+            PsiDocumentManager.getInstance(project).getDocument(psi)?.let { doc ->
+                runInEdt {
+                    runWriteAction {
+                        doc.setText(def.source)
                     }
                 }
             }
         }
+    }
 
-        if (virtualFile != null) {
-            runInEdt {
-                FileEditorManager.getInstance(project).openFile(virtualFile, true, true)
-            }
-        }
-
-        return virtualFile
+    private fun grabFromDB(oid: Long): PlApiFunctionDef? {
+        return executor.getFunctionDef(oid)
     }
 
+    private fun grabFromVFS(oid: Long): PlFunctionSource? = runReadAction {
+        vfs.findFileByPath("$oid")
+    }
 
+    private fun compareMD5(inDB: PlApiFunctionDef, inVFS: PlFunctionSource): Boolean {
+        return inDB.md5 == inVFS.md5
+    }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/net/plpgsql/ideadebugger/vfs/PlVirtualFileSystem.kt b/src/main/kotlin/net/plpgsql/ideadebugger/vfs/PlVirtualFileSystem.kt
index d0e58f1..2281cc2 100644
--- a/src/main/kotlin/net/plpgsql/ideadebugger/vfs/PlVirtualFileSystem.kt
+++ b/src/main/kotlin/net/plpgsql/ideadebugger/vfs/PlVirtualFileSystem.kt
@@ -20,11 +20,16 @@ class PlVirtualFileSystem : DummyCachingFileSystem<PlFunctionSource>(PROTOCOL) {
 
     override fun doRenameFile(vFile: VirtualFile, newName: String) {}
 
+    object Util {
+        private val INSTANCE = Objects.requireNonNull(VirtualFileManager.getInstance().getFileSystem(PROTOCOL))
+                as PlVirtualFileSystem
+
+        fun getInstance(): PlVirtualFileSystem = INSTANCE
+    }
+
     companion object {
         const val PROTOCOL: String = "plpgsql"
         const val PROTOCOL_PREFIX: String = "$PROTOCOL://"
-        private val INSTANCE = Objects.requireNonNull(VirtualFileManager.getInstance().getFileSystem(PROTOCOL)) as PlVirtualFileSystem
-        fun getInstance(): PlVirtualFileSystem = INSTANCE
     }
 
     fun registerNewDefinition(file: PlFunctionSource): PlFunctionSource {
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 7fa78bb..6155183 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -18,7 +18,7 @@
         <applicationConfigurable parentId="tools"
                              instance="net.plpgsql.ideadebugger.ui.PlDebuggerSettingsDialog"
                              id="net.plpgsql.ideadebugger.settings.PlSettingsConfigurable"
-                             displayName="PL/pg Debugger"/>
+                             displayName="PL/pgSQL Debugger"/>
         <applicationService serviceImplementation="net.plpgsql.ideadebugger.settings.PlDebuggerSettingsState"/>
         <applicationService serviceInterface="net.plpgsql.ideadebugger.service.PlProcessWatcher"
                             serviceImplementation="net.plpgsql.ideadebugger.service.PlProcessWatcherImpl" />
diff --git a/src/test/kotlin/net/plpgsql/ideadebugger/PlFunctionSourceTest.kt b/src/test/kotlin/net/plpgsql/ideadebugger/PlFunctionSourceTest.kt
index 45386d9..ae2343f 100644
--- a/src/test/kotlin/net/plpgsql/ideadebugger/PlFunctionSourceTest.kt
+++ b/src/test/kotlin/net/plpgsql/ideadebugger/PlFunctionSourceTest.kt
@@ -58,7 +58,7 @@ class PlFunctionSourceTest(
     fun `test function source`() {
         val sourceCode = getFunctionSource(this, postgres, file)
         val def = PlApiFunctionDef(0, "public", file, sourceCode, sourceCode.md5())
-        val plSource = PlFunctionSource(project, def)
+        val plSource = PlFunctionSource(project, def, def.md5)
         Assertions.assertEquals(start, plSource.start)
         Assertions.assertEquals(range, plSource.codeRange)
     }
diff --git a/src/test/testData/test.sql b/src/test/testData/test.sql
index fe103b7..9dcb77a 100644
--- a/src/test/testData/test.sql
+++ b/src/test/testData/test.sql
@@ -1,4 +1,4 @@
-create extension pldbgapi;
+create extension if not exists pldbgapi;
 
 create type custom_type as
 (