diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 775e86160..b5e09b09b 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -64,7 +64,7 @@ jobs:
           DEST_DIR="arkanalyzer"
           MAX_RETRIES=10
           RETRY_DELAY=3  # Delay between retries in seconds  
-          BRANCH="neo/2025-03-21"
+          BRANCH="neo/2025-04-14"
           
           for ((i=1; i<=MAX_RETRIES; i++)); do
               git clone --depth=1 --branch $BRANCH $REPO_URL $DEST_DIR && break
diff --git a/jacodb-ets/src/main/kotlin/org/jacodb/ets/dto/Convert.kt b/jacodb-ets/src/main/kotlin/org/jacodb/ets/dto/Convert.kt
index ec6845f69..655333ef8 100644
--- a/jacodb-ets/src/main/kotlin/org/jacodb/ets/dto/Convert.kt
+++ b/jacodb-ets/src/main/kotlin/org/jacodb/ets/dto/Convert.kt
@@ -390,7 +390,7 @@ class EtsMethodBuilder(
         )
 
         is PtrCallExprDto -> EtsPtrCallExpr(
-            ptr = (ptr as LocalDto).toEtsLocal(), // safe cast
+            ptr = ensureLocal(ptr.toEtsEntity() as EtsValue), // safe cast
             method = method.toEtsMethodSignature(),
             args = args.map { ensureLocal(it.toEtsEntity()) },
         )
@@ -792,7 +792,7 @@ fun LocalDto.toEtsLocal(): EtsLocal {
     )
 }
 
-private fun Int.toEtsClassCategory() : EtsClassCategory {
+private fun Int.toEtsClassCategory(): EtsClassCategory {
     return when (this) {
         0 -> EtsClassCategory.CLASS
         1 -> EtsClassCategory.STRUCT
diff --git a/jacodb-ets/src/main/kotlin/org/jacodb/ets/dto/Values.kt b/jacodb-ets/src/main/kotlin/org/jacodb/ets/dto/Values.kt
index 8072c99c5..7bc3e2fc5 100644
--- a/jacodb-ets/src/main/kotlin/org/jacodb/ets/dto/Values.kt
+++ b/jacodb-ets/src/main/kotlin/org/jacodb/ets/dto/Values.kt
@@ -275,7 +275,7 @@ data class StaticCallExprDto(
 @Serializable
 @SerialName("PtrCallExpr")
 data class PtrCallExprDto(
-    val ptr: ValueDto, // Local
+    val ptr: ValueDto, // Local or FieldRef
     override val method: MethodSignatureDto,
     override val args: List<ValueDto>,
 ) : CallExprDto