diff --git a/src/main/java/com/intellij/struts2/model/constant/contributor/ConstantValueClassConverter.java b/src/main/java/com/intellij/struts2/model/constant/contributor/ConstantValueClassConverter.java
index 16b6aee..3cd2b7c 100644
--- a/src/main/java/com/intellij/struts2/model/constant/contributor/ConstantValueClassConverter.java
+++ b/src/main/java/com/intellij/struts2/model/constant/contributor/ConstantValueClassConverter.java
@@ -54,9 +54,9 @@ class ConstantValueClassConverter extends ResolvingConverter<PsiClass> implement
         javaClassReferenceProvider.setAllowEmpty(false);
         javaClassReferenceProvider.setOption(JavaClassReferenceProvider.CONCRETE, Boolean.TRUE);
         javaClassReferenceProvider.setOption(JavaClassReferenceProvider.NOT_INTERFACE, Boolean.TRUE);
-        // TODO: EXTEND_CLASS_NAMES is deprecated but no replacement is documented.
-        //noinspection deprecation
-        javaClassReferenceProvider.setOption(JavaClassReferenceProvider.EXTEND_CLASS_NAMES, new String[]{baseClass});
+        if (!baseClass.isEmpty()) {
+            javaClassReferenceProvider.setOption(JavaClassReferenceProvider.SUPER_CLASSES, Collections.singletonList(baseClass));
+        }
     }
 
     @NotNull