diff --git a/CFML/.idea/runConfigurations/CFML_Tests.xml b/CFML/.idea/runConfigurations/CFML_Tests.xml
index 5e76a0539a3..d7d09c662a9 100644
--- a/CFML/.idea/runConfigurations/CFML_Tests.xml
+++ b/CFML/.idea/runConfigurations/CFML_Tests.xml
@@ -1,24 +1,17 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="CFML Tests" type="JUnit" factoryName="JUnit">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
     <module name="CFML-plugin" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
+    <shortenClasspath name="CLASSPATH_FILE" />
     <option name="PACKAGE_NAME" value="com.jetbrains.lang.dart" />
     <option name="MAIN_CLASS_NAME" value="" />
     <option name="METHOD_NAME" value="" />
     <option name="TEST_OBJECT" value="directory" />
-    <option name="VM_PARAMETERS" value="-ea" />
     <option name="PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="TEST_SEARCH_SCOPE">
       <value defaultName="moduleWithDependencies" />
     </option>
-    <envs />
     <dir value="$PROJECT_DIR$/tests/com" />
-    <patterns />
     <RunnerSettings RunnerId="Debug">
       <option name="DEBUG_PORT" value="" />
       <option name="TRANSPORT" value="0" />
@@ -27,6 +20,8 @@
     <RunnerSettings RunnerId="Run" />
     <ConfigurationWrapper RunnerId="Debug" />
     <ConfigurationWrapper RunnerId="Run" />
-    <method />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
   </configuration>
 </component>
\ No newline at end of file
diff --git a/CFML/CFML-plugin.iml b/CFML/CFML-plugin.iml
index 00d76084934..15df663f097 100644
--- a/CFML/CFML-plugin.iml
+++ b/CFML/CFML-plugin.iml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PLUGIN_MODULE" version="4">
   <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/resources/META-INF/plugin.xml" />
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
       <excludeFolder url="file://$MODULE_DIR$/source_for_IDEA8" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
diff --git a/CFML/resources/META-INF/plugin.xml b/CFML/resources/META-INF/plugin.xml
index bd2287157b6..a42f6000543 100644
--- a/CFML/resources/META-INF/plugin.xml
+++ b/CFML/resources/META-INF/plugin.xml
@@ -1,6 +1,7 @@
 <idea-plugin>
   <id>CFML Support</id>
   <name>CFML</name>
+  <version>2019.3.0-BETA</version>
   <description>
     <![CDATA[
     Adds support for ColdFusion Markup Language (CFML).
@@ -17,6 +18,9 @@ To configure path mappings, open the <b>Settings / Preferences</b> dialog and se
   <depends>com.intellij.modules.java</depends>
   <depends>com.intellij.modules.ultimate</depends>
   <depends>com.intellij.modules.idea.ultimate</depends>
+  
+  <!-- Minimum and maximum build of IDE compatible with the plugin -->
+  <idea-version since-build="193" until-build="193.*"/>
 
   <extensions defaultExtensionNs="com.intellij">
     <psi.referenceContributor language="CFML"
@@ -103,6 +107,8 @@ To configure path mappings, open the <b>Settings / Preferences</b> dialog and se
 
     <multiHostInjector implementation="com.intellij.coldFusion.injection.CfmlSqlMultiHostInjector" order="first"/>
     <editorHighlighterProvider filetype="CFML" implementationClass="com.intellij.coldFusion.model.files.CfmlEditorHighlighterProvider"/>
+
+    <typeDeclarationProvider implementation="com.intellij.coldFusion.navigation.actions.CfmlTypeDeclarationProvider"/>
   </extensions>
 
   <actions>
diff --git a/CFML/src/com/intellij/coldFusion/UI/CfmlLookUpItemUtil.java b/CFML/src/com/intellij/coldFusion/UI/CfmlLookUpItemUtil.java
index 85272c185d6..a034a2d7f93 100755
--- a/CFML/src/com/intellij/coldFusion/UI/CfmlLookUpItemUtil.java
+++ b/CFML/src/com/intellij/coldFusion/UI/CfmlLookUpItemUtil.java
@@ -11,6 +11,7 @@
 import com.intellij.codeInsight.lookup.PsiTypeLookupItem;
 import com.intellij.coldFusion.UI.editorActions.completionProviders.CfmlMethodInsertHandler;
 import com.intellij.coldFusion.model.info.CfmlFunctionDescription;
+import com.intellij.coldFusion.model.info.CfmlPropertyDescription;
 import com.intellij.coldFusion.model.psi.*;
 import com.intellij.coldFusion.model.psi.impl.CfmlNamedAttributeImpl;
 import com.intellij.openapi.util.text.StringUtil;
@@ -132,10 +133,23 @@ public static CfmlFunctionDescription getFunctionDescription(CfmlFunction functi
     PsiType returnType = function.getReturnType();
     CfmlFunctionDescription functionInfo = new CfmlFunctionDescription(function.getName(),
                                                                        returnType != null ? returnType.getCanonicalText() : null);
+
+    functionInfo.setDescription(function.getDescription());
     CfmlParameter[] params = function.getParameters();
     for (CfmlParameter param : params) {
-      functionInfo.addParameter(new CfmlFunctionDescription.CfmlParameterDescription(param.getName(), param.getType(), param.isRequired()));
+      CfmlFunctionDescription.CfmlParameterDescription description =
+        new CfmlFunctionDescription.CfmlParameterDescription(param.getName(), param.getType(), param.getDefault(), param.isRequired());
+      description.setDescription(param.getDescription());
+      functionInfo.addParameter(description);
     }
     return functionInfo;
   }
+  
+  public static CfmlPropertyDescription getPropertyDescription(CfmlProperty property) {
+    PsiType type = property.getPsiType();
+    CfmlPropertyDescription propertyInfo = new CfmlPropertyDescription(property.getName(),
+                                                                       type != null ? type.getCanonicalText() : null);
+    propertyInfo.setDescription(property.getDescription());
+    return propertyInfo;
+  }
 }
diff --git a/CFML/src/com/intellij/coldFusion/UI/editorActions/CfmlDocumentProvider.java b/CFML/src/com/intellij/coldFusion/UI/editorActions/CfmlDocumentProvider.java
index 7c866600d4e..e29ed856e93 100644
--- a/CFML/src/com/intellij/coldFusion/UI/editorActions/CfmlDocumentProvider.java
+++ b/CFML/src/com/intellij/coldFusion/UI/editorActions/CfmlDocumentProvider.java
@@ -2,6 +2,9 @@
 package com.intellij.coldFusion.UI.editorActions;
 
 import com.intellij.coldFusion.model.CfmlUtil;
+import com.intellij.coldFusion.model.psi.CfmlComponent;
+import com.intellij.coldFusion.model.psi.CfmlFunction;
+import com.intellij.coldFusion.model.psi.CfmlProperty;
 import com.intellij.coldFusion.model.psi.CfmlTag;
 import com.intellij.coldFusion.model.psi.impl.CfmlAttributeImpl;
 import com.intellij.coldFusion.model.psi.impl.CfmlAttributeNameImpl;
@@ -21,7 +24,16 @@ public class CfmlDocumentProvider extends DocumentationProviderEx {
 
   @Override
   public String generateDoc(PsiElement element, PsiElement originalElement) {
-    if (element instanceof CfmlAttributeImpl && element.getParent() instanceof CfmlTag) {
+    if (element instanceof CfmlComponent) {
+      return CfmlUtil.getComponentDescription((CfmlComponent)element, element.getProject());
+    }
+    else if (element instanceof CfmlFunction) {
+      return CfmlUtil.getFunctionDescription((CfmlFunction)element, element.getProject());
+    }
+    else if (element instanceof CfmlProperty) {
+      return CfmlUtil.getPropertyDescription((CfmlProperty)element, element.getProject());
+    }
+    else if (element instanceof CfmlAttributeImpl && element.getParent() instanceof CfmlTag) {
       String tagName = StringUtil.toLowerCase(((CfmlTag)element.getParent()).getTagName());
       String attributeName = (element instanceof CfmlAttributeNameImpl) ?
                              "name" :
diff --git a/CFML/src/com/intellij/coldFusion/UI/editorActions/CfmlParameterInfoHandler.java b/CFML/src/com/intellij/coldFusion/UI/editorActions/CfmlParameterInfoHandler.java
index 3f5912dec83..848dd31f440 100755
--- a/CFML/src/com/intellij/coldFusion/UI/editorActions/CfmlParameterInfoHandler.java
+++ b/CFML/src/com/intellij/coldFusion/UI/editorActions/CfmlParameterInfoHandler.java
@@ -114,9 +114,11 @@ else if (element1 instanceof PsiMethod) {
                 new CfmlFunctionDescription(function.getName(), function.getReturnType().getPresentableText());
               final PsiParameter[] psiParameters = function.getParameterList().getParameters();
               for (PsiParameter psiParameter : psiParameters) {
+                PsiExpression initializerElement = psiParameter.getInitializer();
+                String initializerValue = initializerElement == null ? null : initializerElement.getText();
                 javaMethodDescr.addParameter(new CfmlFunctionDescription.CfmlParameterDescription(psiParameter.getName(),
                                                                                                   psiParameter.getType()
-                                                                                                    .getPresentableText(), true));
+                                                                                                    .getPresentableText(), initializerValue, true));
               }
               return javaMethodDescr;
             }
diff --git a/CFML/src/com/intellij/coldFusion/UI/editorActions/CfmllFindUsagesProvider.java b/CFML/src/com/intellij/coldFusion/UI/editorActions/CfmllFindUsagesProvider.java
index b5386ae5b94..c569be3c845 100644
--- a/CFML/src/com/intellij/coldFusion/UI/editorActions/CfmllFindUsagesProvider.java
+++ b/CFML/src/com/intellij/coldFusion/UI/editorActions/CfmllFindUsagesProvider.java
@@ -19,6 +19,7 @@ public class CfmllFindUsagesProvider implements FindUsagesProvider {
   public boolean canFindUsagesFor(@NotNull final PsiElement psiElement) {
     return psiElement instanceof CfmlReferenceExpression || (psiElement instanceof CfmlTagFunctionImpl) ||
            (psiElement instanceof CfmlTag && ((CfmlTag)psiElement).getTagName().equalsIgnoreCase("cfargument")) ||
+           (psiElement instanceof CfmlTag && ((CfmlTag)psiElement).getTagName().equalsIgnoreCase("cfparam")) ||
            psiElement instanceof CfmlFunctionImpl || psiElement instanceof CfmlFunctionParameterImpl;
   }
 
diff --git a/CFML/src/com/intellij/coldFusion/UI/editorActions/completionProviders/CfmlAttributeValuesCompletionProvider.java b/CFML/src/com/intellij/coldFusion/UI/editorActions/completionProviders/CfmlAttributeValuesCompletionProvider.java
index 852c113ae54..e19fad4aa63 100644
--- a/CFML/src/com/intellij/coldFusion/UI/editorActions/completionProviders/CfmlAttributeValuesCompletionProvider.java
+++ b/CFML/src/com/intellij/coldFusion/UI/editorActions/completionProviders/CfmlAttributeValuesCompletionProvider.java
@@ -40,6 +40,7 @@ public void addCompletions(@NotNull final CompletionParameters parameters,
     String[] attributeValue = CfmlUtil.getAttributeValues(tagName, attributeName, parameters.getPosition().getProject());
 
     if ("type".equalsIgnoreCase(attributeName) && "cfargument".equalsIgnoreCase(tagName) ||
+        "type".equalsIgnoreCase(attributeName) && "cfproperty".equalsIgnoreCase(tagName) ||
         "returntype".equalsIgnoreCase(attributeName) && "cffunction".equalsIgnoreCase(tagName)
        ) {
       Object[] objects =
diff --git a/CFML/src/com/intellij/coldFusion/injection/CfqueryEscaper.kt b/CFML/src/com/intellij/coldFusion/injection/CfqueryEscaper.kt
index baa3db85221..90af2d03dd8 100644
--- a/CFML/src/com/intellij/coldFusion/injection/CfqueryEscaper.kt
+++ b/CFML/src/com/intellij/coldFusion/injection/CfqueryEscaper.kt
@@ -18,10 +18,14 @@ class CfqueryEscaper(tag: CfmlTagImpl) : LiteralTextEscaper<CfmlTagImpl>(tag) {
 
   //exclude cfquery tags from TextRange
   override fun getRelevantTextRange(): TextRange {
-    val startOffset = Regex("<cfquery[^>]*>").find(myHost.text)!!.range.endInclusive + 1
-    val closeTagOffset = Regex("</cfquery[^>]*>").find(myHost.text) ?: return TextRange(startOffset, startOffset)
-    val endOffset = closeTagOffset.range.start
-    return TextRange(startOffset, endOffset)
+    try {
+      val startOffset = Regex("<cfquery[^>]*>").find(myHost.text)!!.range.endInclusive + 1
+      val closeTagOffset = Regex("</cfquery[^>]*>").find(myHost.text) ?: return TextRange(startOffset, startOffset)
+      val endOffset = closeTagOffset.range.start
+      return TextRange(startOffset, endOffset)
+    } catch (e: KotlinNullPointerException) {
+      return TextRange(0, 0)
+    }
   }
 
 }
\ No newline at end of file
diff --git a/CFML/src/com/intellij/coldFusion/model/CfmlDocUtil.kt b/CFML/src/com/intellij/coldFusion/model/CfmlDocUtil.kt
index f52a6eb0525..ab1959820f3 100644
--- a/CFML/src/com/intellij/coldFusion/model/CfmlDocUtil.kt
+++ b/CFML/src/com/intellij/coldFusion/model/CfmlDocUtil.kt
@@ -7,9 +7,13 @@ import com.intellij.coldFusion.model.info.CfmlAttributeDescription
 import com.intellij.coldFusion.model.info.CfmlLangInfo
 import com.intellij.coldFusion.model.info.CfmlTagDescription
 import com.intellij.coldFusion.model.info.CfmlTypesInfo
+import com.intellij.coldFusion.model.psi.CfmlComponent
+import com.intellij.coldFusion.model.psi.CfmlFunction
+import com.intellij.coldFusion.model.psi.CfmlProperty
 import com.intellij.openapi.project.Project
 import com.intellij.util.containers.isNullOrEmpty
 import com.intellij.xml.util.XmlStringUtil
+import java.util.*
 
 object CfmlDocUtil {
 
@@ -117,4 +121,58 @@ object CfmlDocUtil {
     return "<b>$this</b>"
   }
 
+  private fun String.faint(): String {
+    return "<span style=\"font-weight: lighter;\">$this</span>"
+  }
+
+  @JvmStatic
+  fun componentDescription(component: CfmlComponent, project: Project): String {
+    var description = p { (component.name ?: "Unknown component name").bold() }
+
+    val hintDescription = component.description
+    if (hintDescription != null) {
+      description += p { hintDescription }
+    }
+
+    val init = Arrays.stream(component.getFunctionsWithSupers(false)).filter { f: CfmlFunction -> f.name == "init" }
+           .findFirst()
+    if (init.isPresent) {
+      description += "<p></p>" + functionDescription(init.get(), project)
+    }
+    return description
+  }
+
+  @JvmStatic
+  fun functionDescription(function: CfmlFunction, project: Project): String {
+    val info = function.functionInfo
+    var paramsLabel = "Params: ".faint()
+    return p {
+      info.name.trim().bold() + if (info.parameters.isEmpty()) "()" else "(...)" + " : " + (info.returnType ?: "any")
+    } + p {
+      info.description?.trim() ?: ""
+    } + table {
+      info.parameters.map {
+        tr {
+          td {
+            paramsLabel
+          } + td {
+            paramsLabel = ""
+            it.presetableText.bold() + "  "
+          } + td {
+            it.description?.trim() ?: ""
+          }
+        }
+      }.joinToString("")
+    }
+  }
+
+  @JvmStatic
+  fun propertyDescription(property: CfmlProperty, project: Project): String {
+    val info = property.propertyInfo
+    return p {
+      info.name.trim().bold() + " : " + (info.type ?: "any")
+    } + p {
+      info.description?.trim() ?: ""
+    }
+  }
 }
\ No newline at end of file
diff --git a/CFML/src/com/intellij/coldFusion/model/CfmlUtil.java b/CFML/src/com/intellij/coldFusion/model/CfmlUtil.java
index 8db2e7a6fef..2744c7521cf 100644
--- a/CFML/src/com/intellij/coldFusion/model/CfmlUtil.java
+++ b/CFML/src/com/intellij/coldFusion/model/CfmlUtil.java
@@ -2,14 +2,14 @@
 package com.intellij.coldFusion.model;
 
 import com.intellij.codeInsight.AutoPopupController;
+import com.intellij.coldFusion.model.files.CfmlFile;
 import com.intellij.coldFusion.model.info.CfmlAttributeDescription;
 import com.intellij.coldFusion.model.info.CfmlLangInfo;
 import com.intellij.coldFusion.model.info.CfmlTagDescription;
 import com.intellij.coldFusion.model.lexer.CfmlTokenTypes;
 import com.intellij.coldFusion.model.lexer.CfscriptTokenTypes;
 import com.intellij.coldFusion.model.parsers.CfmlKeywords;
-import com.intellij.coldFusion.model.psi.CfmlImport;
-import com.intellij.coldFusion.model.psi.CfmlReferenceExpression;
+import com.intellij.coldFusion.model.psi.*;
 import com.intellij.coldFusion.model.psi.impl.CfmlTagImpl;
 import com.intellij.lang.Language;
 import com.intellij.lang.PsiBuilder;
@@ -25,6 +25,7 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiType;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.ArrayUtil;
@@ -167,6 +168,18 @@ public static boolean isEndTagRequired(String tagName, Project project) {
     return getCfmlLangInfo(project).getTagAttributes().get(tagName).isEndTagRequired();
   }
 
+  public static String getComponentDescription(CfmlComponent component, Project project) {
+    return CfmlDocUtil.componentDescription(component, project);
+  }
+
+  public static String getFunctionDescription(CfmlFunction function, Project project) {
+    return CfmlDocUtil.functionDescription(function, project);
+  }
+
+  public static String getPropertyDescription(CfmlProperty property, Project project) {
+    return CfmlDocUtil.propertyDescription(property, project);
+  }
+
   public static String getTagDescription(String tagName, Project project) {
     return CfmlDocUtil.tagDescription(tagName, project);
   }
@@ -294,4 +307,24 @@ public static Couple<String> getPrefixAndName(String name) {
     }
     return Couple.of(name.substring(0, index), name.substring(index + 1));
   }
+
+  @Nullable
+  public static PsiType getTypeFromName(CfmlFile file, String typeName, Project project) {
+    if (file == null || typeName == null) return null;
+
+    final boolean isArray = typeName.endsWith("[]");
+    final String qualifiedTypeString;
+    if (isArray) {
+      qualifiedTypeString = file.getComponentQualifiedName(typeName.substring(0, typeName.length() - 2));
+    }
+    else {
+      qualifiedTypeString = file.getComponentQualifiedName(typeName);
+    }
+    if (qualifiedTypeString == null) return null;
+    PsiType type = new CfmlComponentType(qualifiedTypeString, file, project);
+    if (isArray) {
+      type = type.createArrayType();
+    }
+    return type;
+  }
 }
diff --git a/CFML/src/com/intellij/coldFusion/model/files/CfmlFile.java b/CFML/src/com/intellij/coldFusion/model/files/CfmlFile.java
index e602d660c85..994d7b5391f 100644
--- a/CFML/src/com/intellij/coldFusion/model/files/CfmlFile.java
+++ b/CFML/src/com/intellij/coldFusion/model/files/CfmlFile.java
@@ -178,7 +178,7 @@ public String getComponentQualifiedName(@NotNull String componentName) {
     CfmlImport[] childrenByClass = findChildrenByClass(CfmlImport.class);
     for (CfmlImport importStatement : childrenByClass) {
       if (importStatement.isImported(componentName)) {
-        String importString = importStatement.getImportString();
+        String importString = importStatement.getComponentQualifiedName(componentName);
         return importString != null ? importString : "";
       }
     }
@@ -189,10 +189,8 @@ public Collection<String> getImportStrings() {
     Set<String> result = new HashSet<>();
     CfmlImport[] childrenByClass = findChildrenByClass(CfmlImport.class);
     for (CfmlImport importStatement : childrenByClass) {
-      String importString = importStatement.getImportString();
-      if (importString != null) {
-        result.add(importString);
-      }
+      Set<String> importStrings = importStatement.getAllComponentQualifiedNames();
+      result.addAll(importStrings);
     }
     return result;
   }
diff --git a/CFML/src/com/intellij/coldFusion/model/info/CfmlFunctionDescription.java b/CFML/src/com/intellij/coldFusion/model/info/CfmlFunctionDescription.java
index 6b1d9b313c4..14e88180cdb 100755
--- a/CFML/src/com/intellij/coldFusion/model/info/CfmlFunctionDescription.java
+++ b/CFML/src/com/intellij/coldFusion/model/info/CfmlFunctionDescription.java
@@ -59,12 +59,14 @@ public void setDescription(String description) {
   public static class CfmlParameterDescription {
     private final String myName;
     private final String myType;
+    private final String myDefault;
     private final boolean myIsRequired;
     private String myDescription;
 
-    public CfmlParameterDescription(String name, String type, boolean isRequired) {
+    public CfmlParameterDescription(String name, String type, String defaultValue, boolean isRequired) {
       myName = name;
       myType = type;
+      myDefault = defaultValue;
       myIsRequired = isRequired;
     }
 
@@ -75,6 +77,10 @@ public String getName() {
     public String getType() {
       return myType;
     }
+    
+    public String getDefault() {
+      return myDefault;
+    }
 
     public boolean isRequired() {
       return myIsRequired;
@@ -95,6 +101,10 @@ public String getPresetableText() {
       if (type != null) {
         paramDescription = paramDescription + " : " + type;
       }
+      final String defaultValue = getDefault();
+      if (defaultValue != null) {
+        paramDescription = paramDescription + " = \"" + defaultValue + "\"";
+      }
       if (!isRequired()) {
         sb.append("[");
         sb.append(paramDescription);
diff --git a/CFML/src/com/intellij/coldFusion/model/info/CfmlPropertyDescription.java b/CFML/src/com/intellij/coldFusion/model/info/CfmlPropertyDescription.java
new file mode 100644
index 00000000000..d4455b7e89c
--- /dev/null
+++ b/CFML/src/com/intellij/coldFusion/model/info/CfmlPropertyDescription.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2000-2020 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.coldFusion.model.info;
+
+public class CfmlPropertyDescription {
+
+  private final String myName;
+  private final String myType;
+  private String myDescription;
+
+  public CfmlPropertyDescription(String name, String Type) {
+    myName = name;
+    myType = Type;
+  }
+
+  public String getName() {
+    return myName;
+  }
+
+  public String getType() {
+    return myType;
+  }
+
+  public String getDescription() {
+    return myDescription;
+  }
+
+  public void setDescription(String description) {
+    myDescription = description;
+  }
+
+  public String getPresentableText() {
+    StringBuilder buffer = new StringBuilder();
+    buffer.append(getName());
+    final String type = getType();
+    if (type != null) {
+      buffer.append(" : ");
+      buffer.append(type);
+    }
+    return buffer.toString();
+  }
+}
diff --git a/CFML/src/com/intellij/coldFusion/model/info/CfmlTagsDescriptionsParser.java b/CFML/src/com/intellij/coldFusion/model/info/CfmlTagsDescriptionsParser.java
index 993c319baab..9970378e2c3 100644
--- a/CFML/src/com/intellij/coldFusion/model/info/CfmlTagsDescriptionsParser.java
+++ b/CFML/src/com/intellij/coldFusion/model/info/CfmlTagsDescriptionsParser.java
@@ -135,9 +135,10 @@ else if (myState == FUNCTION_STATE) {
       else if (localName.equals("parameter") && myCurrentFunction != null) {
         String aName = attr.getValue("name");
         String aType = attr.getValue("type");
+        String aDefault = attr.getValue("default");
         boolean aRequired = Boolean.valueOf(attr.getValue("required"));
 
-        myCurrentFunction.addParameter(new CfmlFunctionDescription.CfmlParameterDescription(aName, aType, aRequired));
+        myCurrentFunction.addParameter(new CfmlFunctionDescription.CfmlParameterDescription(aName, aType, aDefault, aRequired));
       }
       else if (localName.equals("help")) {
         myIsFunctionHelpSection = true;
diff --git a/CFML/src/com/intellij/coldFusion/model/parsers/CfmlElementTypes.java b/CFML/src/com/intellij/coldFusion/model/parsers/CfmlElementTypes.java
index edd6517f450..49a7592d5e2 100644
--- a/CFML/src/com/intellij/coldFusion/model/parsers/CfmlElementTypes.java
+++ b/CFML/src/com/intellij/coldFusion/model/parsers/CfmlElementTypes.java
@@ -127,6 +127,12 @@ public PsiElement createPsiElement(final ASTNode node) {
       return new CfmlReferenceExpression(node);
     }
   };
+  IElementType ARRAY_ACCESS_EXPRESSION = new CfmlCompositeElementType("ArrayAccessExpression") {
+    @Override
+    public PsiElement createPsiElement(final ASTNode node) {
+      return new CfmlArrayAccessExpression(node);
+    }
+  };
   CfmlCompositeElementType FUNCTION_CALL_EXPRESSION = new CfmlCompositeElementType("FunctionCallExpression") {
     @Override
     public PsiElement createPsiElement(final ASTNode node) {
@@ -181,6 +187,12 @@ public PsiElement createPsiElement(final ASTNode node) {
       return new CfmlTagFunctionParameterImpl(node);
     }
   };
+  CfmlCompositeElementType PARAM_TAG = new CfmlCompositeElementType("Tag") {
+    @Override
+    public PsiElement createPsiElement(final ASTNode node) {
+      return new CfmlTagParamImpl(node);
+    }
+  };
   CfmlCompositeElementType SCRIPT_TAG = new CfmlCompositeElementType("Tag") {
     @Override
     public PsiElement createPsiElement(final ASTNode node) {
diff --git a/CFML/src/com/intellij/coldFusion/model/parsers/CfmlExpressionParser.java b/CFML/src/com/intellij/coldFusion/model/parsers/CfmlExpressionParser.java
index 27a5189f69d..0ebb0e15ae3 100644
--- a/CFML/src/com/intellij/coldFusion/model/parsers/CfmlExpressionParser.java
+++ b/CFML/src/com/intellij/coldFusion/model/parsers/CfmlExpressionParser.java
@@ -18,6 +18,7 @@
 import com.intellij.coldFusion.CfmlBundle;
 import com.intellij.coldFusion.model.lexer.CfmlTokenTypes;
 import com.intellij.coldFusion.model.lexer.CfscriptTokenTypes;
+import com.intellij.coldFusion.model.psi.CfmlElementType;
 import com.intellij.lang.PsiBuilder;
 import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.Nullable;
@@ -100,7 +101,8 @@ public boolean parseExpression() {
         return true;
       }
       expr.done(CfmlElementTypes.TERNARY_EXPRESSION);
-    } else if (myBuilder.getTokenType() == ELVIS) {
+    }
+    else if (myBuilder.getTokenType() == ELVIS) {
       advance();
       if (!parseExpression()) {
         myBuilder.error(CfmlBundle.message("cfml.parsing.expression.expected"));
@@ -445,6 +447,9 @@ public void parseComponentReference() {
       }
       myBuilder.advanceLexer();
     }
+    if (myBuilder.getTokenType() == MUL) {
+      myBuilder.advanceLexer();
+    }
     componentReferenceMarker.done(CfmlElementTypes.COMPONENT_REFERENCE);
   }
 
@@ -495,8 +500,7 @@ else if (parseNewExpression()) {
           isReference = true;
           referenceExpression = referenceExpression.precede();
           parseArrayAccess();
-          // referenceExpression.done(CfmlElementTypes.ARRAY_ACCESS);
-          referenceExpression.done(CfmlElementTypes.NONE);
+          referenceExpression.done(CfmlElementTypes.ARRAY_ACCESS_EXPRESSION);
           arrayAccessNumber++;
         }
         if (arrayAccessNumber != 1) {
@@ -619,7 +623,7 @@ else if (parseRValue()) {
   */
 
   private void parseAssignsList() {
-    while(true) {
+    while (true) {
       parseAssignmentExpression(true);
       if (getTokenType() != COMMA) break;
       advance();
@@ -634,6 +638,7 @@ public boolean parseNewExpression() {
       return false;
     }
     PsiBuilder.Marker newExpression = mark();
+    PsiBuilder.Marker outerExpression = newExpression;
     advance();
     PsiBuilder.Marker constructorCall = mark();
     if (getTokenType() == CfmlTokenTypes.DOUBLE_QUOTE) {
@@ -643,11 +648,35 @@ else if (getTokenType() == CfscriptTokenTypes.IDENTIFIER) {
       parseComponentReference();
     }
     else {
-      myBuilder.error(CfmlBundle.message("cfml.parsing.identifier.expected"));
+      newExpression.rollbackTo();
+      return false;
     }
     parseArgumentsList();
     constructorCall.done(CfmlElementTypes.COMPONENT_CONSTRUCTOR_CALL);
     newExpression.done(CfmlElementTypes.NEW_EXPRESSION);
+    while (getTokenType() == POINT) {
+      PsiBuilder.Marker beforePoint = mark();
+      outerExpression = outerExpression.precede();
+      advance();
+      if (getTokenType() == IDENTIFIER) {
+        advance();
+        beforePoint.drop();
+        outerExpression.done(CfmlElementTypes.REFERENCE_EXPRESSION);
+        beforePoint = mark();
+        if (getTokenType() == L_BRACKET) {
+          outerExpression = outerExpression.precede();
+          if (!parseArgumentsList()) {
+            beforePoint.rollbackTo();
+            break;
+          }
+          outerExpression.done(CfmlElementTypes.FUNCTION_CALL_EXPRESSION);
+        }
+        beforePoint.drop();
+        continue;
+      }
+      beforePoint.rollbackTo();
+      break;
+    }
     return true;
   }
 
diff --git a/CFML/src/com/intellij/coldFusion/model/parsers/CfmlParser.java b/CFML/src/com/intellij/coldFusion/model/parsers/CfmlParser.java
index aeddc4c9be0..dc1376f5e7d 100644
--- a/CFML/src/com/intellij/coldFusion/model/parsers/CfmlParser.java
+++ b/CFML/src/com/intellij/coldFusion/model/parsers/CfmlParser.java
@@ -47,6 +47,9 @@ else if ("cfinvoke".equals(StringUtil.toLowerCase(tagName))) {
     else if ("cfargument".equals(StringUtil.toLowerCase(tagName))) {
       return CfmlElementTypes.ARGUMENT_TAG;
     }
+    else if ("cfparam".equals(StringUtil.toLowerCase(tagName))) {
+      return CfmlElementTypes.PARAM_TAG;
+    }
     else if ("cfscript".equals(StringUtil.toLowerCase(tagName))) {
       return CfmlElementTypes.SCRIPT_TAG;
     }
@@ -185,6 +188,7 @@ private static boolean doNeedNamedAttribute(String tagName) {
       return false;
     }
     return !(StringUtil.toLowerCase(tagName).equals("cffunction") ||
+             StringUtil.toLowerCase(tagName).equals("cfparam") ||
              StringUtil.toLowerCase(tagName).equals("cfargument"));
   }
 
@@ -218,7 +222,6 @@ else if (tagName.equals("cfif") || tagName.equals("cfelseif") || tagName.equals(
         */
         if (builder.getTokenType() != ASSIGN) {
           attrMarker.done(CfmlElementTypes.ATTRIBUTE);
-          builder.error(CfmlBundle.message("cfml.parsing.no.value"));
           continue;
         }
         builder.advanceLexer();
diff --git a/CFML/src/com/intellij/coldFusion/model/parsers/CfscriptParser.java b/CFML/src/com/intellij/coldFusion/model/parsers/CfscriptParser.java
index 11a4e6d5f33..c541a00323f 100644
--- a/CFML/src/com/intellij/coldFusion/model/parsers/CfscriptParser.java
+++ b/CFML/src/com/intellij/coldFusion/model/parsers/CfscriptParser.java
@@ -24,6 +24,7 @@
 
 import java.util.Objects;
 
+import static com.intellij.coldFusion.model.lexer.CfmlTokenTypes.*;
 import static com.intellij.coldFusion.model.lexer.CfscriptTokenTypes.*;
 import static com.intellij.coldFusion.model.parsers.CfmlKeywordsKt.isKeyword;
 import static com.intellij.coldFusion.model.parsers.CfmlKeywordsKt.parseKeyword;
@@ -444,14 +445,14 @@ private void parseParametersList(PsiBuilder myBuilder) {
     }
     // try to parse type
     final PsiBuilder.Marker marker = myBuilder.mark();
-    if (!parseType(myBuilder) || myBuilder.getTokenType() != IDENTIFIER) {
+    if (!parseType(myBuilder) || (myBuilder.getTokenType() != IDENTIFIER && !KEYWORDS.contains(myBuilder.getTokenType()))) {
       marker.rollbackTo();
     }
     else {
       marker.drop();
     }
     // parse parameter name
-    if (myBuilder.getTokenType() == IDENTIFIER) {
+    if (myBuilder.getTokenType() == IDENTIFIER || KEYWORDS.contains(myBuilder.getTokenType())) {
       myBuilder.advanceLexer();
 
       if (myBuilder.getTokenType() == CfmlTokenTypes.ASSIGN) { // parse default value
@@ -635,6 +636,26 @@ private static boolean parseType(PsiBuilder myBuilder) {
       typeMarker.done(CfmlElementTypes.TYPE);
     }
     else {
+      if (STRING_ELEMENTS.contains(myBuilder.getTokenType())) {
+        final PsiBuilder.Marker stringMarker = myBuilder.mark();
+        myBuilder.advanceLexer();
+        if (myBuilder.getTokenType() != STRING_TEXT) {
+          stringMarker.rollbackTo();
+          myBuilder.error(CfmlBundle.message("cfml.parsing.string.expected"));
+          return false;
+        }
+        final PsiBuilder.Marker typeMarker = myBuilder.mark();
+        myBuilder.advanceLexer();
+        typeMarker.done(CfmlElementTypes.TYPE);
+        if (!STRING_ELEMENTS.contains(myBuilder.getTokenType())) {
+          stringMarker.rollbackTo();
+          myBuilder.error(CfmlBundle.message("cfml.parsing.string.expected"));
+          return false;
+        }
+        myBuilder.advanceLexer();
+        stringMarker.done(CfmlElementTypes.STRING_LITERAL);
+        return true;
+      }
       if (myBuilder.getTokenType() != IDENTIFIER) {
         myBuilder.error(CfmlBundle.message("cfml.parsing.type.expected"));
         return false;
diff --git a/CFML/src/com/intellij/coldFusion/model/psi/CfmlArrayAccessExpression.java b/CFML/src/com/intellij/coldFusion/model/psi/CfmlArrayAccessExpression.java
new file mode 100644
index 00000000000..6fa46ed6ca6
--- /dev/null
+++ b/CFML/src/com/intellij/coldFusion/model/psi/CfmlArrayAccessExpression.java
@@ -0,0 +1,45 @@
+package com.intellij.coldFusion.model.psi;
+
+import com.intellij.lang.ASTNode;
+import com.intellij.psi.PsiArrayType;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiType;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class CfmlArrayAccessExpression extends CfmlCompositeElement implements CfmlExpression, CfmlTypedElement {
+  public CfmlArrayAccessExpression(@NotNull ASTNode node) {
+    super(node);
+  }
+
+  @Nullable
+  public CfmlReference getReferenceExpression() {
+    return findChildByClass(CfmlReferenceExpression.class);
+  }
+
+  @Nullable
+  public PsiType getExternalType() {
+    final CfmlReference referenceExpression = getReferenceExpression();
+    if (referenceExpression != null) {
+      final PsiElement resolve = referenceExpression.resolve();
+      return resolve instanceof CfmlVariable ? ((CfmlVariable)resolve).getPsiType() : null;
+    }
+    return null;
+  }
+
+  @Override
+  @Nullable
+  public PsiType getPsiType() {
+    PsiType type = getExternalType();
+
+    if (type == null) {
+      CfmlReference referenceExpression = getReferenceExpression();
+      type = referenceExpression != null ? referenceExpression.getPsiType() : null;
+    }
+
+    if (type instanceof PsiArrayType) {
+      return ((PsiArrayType)type).getComponentType();
+    }
+    return null;
+  }
+}
diff --git a/CFML/src/com/intellij/coldFusion/model/psi/CfmlComponent.java b/CFML/src/com/intellij/coldFusion/model/psi/CfmlComponent.java
index a6cc2bc150b..384459148af 100755
--- a/CFML/src/com/intellij/coldFusion/model/psi/CfmlComponent.java
+++ b/CFML/src/com/intellij/coldFusion/model/psi/CfmlComponent.java
@@ -24,6 +24,9 @@
 public interface CfmlComponent extends CfmlPsiElement, CfmlNamedElement {
   CfmlComponent[] EMPTY_ARRAY = new CfmlComponent[0];
 
+  @Nullable
+  String getDescription();
+
   @NotNull
   CfmlFunction[] getFunctions();
 
diff --git a/CFML/src/com/intellij/coldFusion/model/psi/CfmlComponentReference.java b/CFML/src/com/intellij/coldFusion/model/psi/CfmlComponentReference.java
index d3d72f02d15..0250f90c65f 100755
--- a/CFML/src/com/intellij/coldFusion/model/psi/CfmlComponentReference.java
+++ b/CFML/src/com/intellij/coldFusion/model/psi/CfmlComponentReference.java
@@ -122,8 +122,8 @@ public static Collection<CfmlComponent> resolveFromQualifiedName(String componen
       // PsiFile containingFile = getContainingFile();
       // containingFile = containingFile == null ? null : containingFile.getOriginalFile();
       {
-        CfmlFile cfmlConteiningFile = originalFile;
-        PsiDirectory directory = cfmlConteiningFile.getParent();
+        CfmlFile cfmlContainingFile = originalFile;
+        PsiDirectory directory = cfmlContainingFile.getParent();
         if (directory != null) {
           GlobalSearchScope searchScope = GlobalSearchScopesCore.directoryScope(directory, false);
 
@@ -166,6 +166,15 @@ public static Collection<CfmlComponent> resolveFromQualifiedName(String componen
       components.addAll(CfmlIndex.getInstance(project).getInterfacesByName(
         componentName));
 
+      if (componentName.equals("*")) {
+        for (String name : CfmlIndex.getInstance(project).getAllComponentsNames()) {
+          components.addAll(CfmlIndex.getInstance(project).getComponentsByName(name));
+        }
+        for (String name : CfmlIndex.getInstance(project).getAllInterfaceNames()) {
+          components.addAll(CfmlIndex.getInstance(project).getInterfacesByName(name));
+        }
+      }
+
       for (CfmlComponent component : components) {
         PsiDirectory parent = component.getContainingFile().getParent();
         if (parent == null) {
@@ -333,7 +342,7 @@ public Object[] getVariants() {
   public static Object[] buildVariants(String text, PsiFile containingFile, final Project project,
                                        @Nullable CfmlComponentReference reference,
                                        final boolean forceQualify
-                                       ) {
+  ) {
     Collection<Object> variants = new THashSet<>();
 
     String directoryName = "";
diff --git a/CFML/src/com/intellij/coldFusion/model/psi/CfmlFunction.java b/CFML/src/com/intellij/coldFusion/model/psi/CfmlFunction.java
index e1b66c61d13..eb8a48a1733 100755
--- a/CFML/src/com/intellij/coldFusion/model/psi/CfmlFunction.java
+++ b/CFML/src/com/intellij/coldFusion/model/psi/CfmlFunction.java
@@ -1,6 +1,8 @@
 // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.coldFusion.model.psi;
 
+import com.intellij.coldFusion.model.CfmlUtil;
+import com.intellij.coldFusion.model.files.CfmlFile;
 import com.intellij.coldFusion.model.info.CfmlFunctionDescription;
 import com.intellij.psi.PsiNameIdentifierOwner;
 import com.intellij.psi.PsiType;
@@ -17,7 +19,18 @@ public interface CfmlFunction extends PsiNameIdentifierOwner {
   CfmlParameter[] getParameters();
 
   @Nullable
-  PsiType getReturnType();
+  default PsiType getReturnType() {
+    return CfmlUtil.getTypeFromName(getContainingFile(), getReturnTypeName(), getProject());
+  }
+
+  @Nullable
+  String getReturnTypeName();
+
+  @Nullable
+  CfmlFile getContainingFile();
+
+  @Nullable
+  String getDescription();
 
   @Override
   @NotNull
diff --git a/CFML/src/com/intellij/coldFusion/model/psi/CfmlImport.java b/CFML/src/com/intellij/coldFusion/model/psi/CfmlImport.java
index 069ae1a0886..575a6cd41e4 100644
--- a/CFML/src/com/intellij/coldFusion/model/psi/CfmlImport.java
+++ b/CFML/src/com/intellij/coldFusion/model/psi/CfmlImport.java
@@ -16,17 +16,84 @@
 package com.intellij.coldFusion.model.psi;
 
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiReference;
+import com.intellij.psi.ResolveResult;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+
 /**
  * @author vnikolaenko
  * @date 16.02.11
  */
 public interface CfmlImport extends PsiElement {
-  boolean isImported(String componentName);
+  default boolean isImported(String componentName) {
+    String importString = getComponentQualifiedName(componentName);
+    return importString != null;
+  };
 
   @Nullable
   String getImportString();
+  
+  @Nullable
+  default String getComponentQualifiedName(String componentName) {
+    String importString = getImportString();
+    if (importString == null) return null;
+    String[] importedPathParts = importString.split("\\.");
+    String importedName = importedPathParts[importedPathParts.length - 1];
+    if (importedName.equals(componentName)) return importString;
+    if (importedName.equals("*")) {
+      PsiReference[] references = getReferences();
+      for (PsiReference reference : references) {
+        if (!(reference instanceof CfmlComponentReference)) {
+          continue;
+        }
+        ResolveResult[] results = ((CfmlComponentReference)reference).multiResolve(false);
+        for (ResolveResult result : results) {
+          PsiElement element = result.getElement();
+          if (element instanceof CfmlComponent) {
+            CfmlComponent component = (CfmlComponent)element;
+            if (Objects.equals(component.getName(), componentName)) {
+              String packagePath = String.join(".", Arrays.copyOfRange(importedPathParts, 0, importedPathParts.length - 1));
+              return packagePath + "." + component.getName();
+            }
+          }
+        }
+      }
+    }
+    return null;
+  };
+  
+  default Set<String> getAllComponentQualifiedNames() {
+    String importString = getImportString();
+    if (importString == null) return null;
+    String[] importedPathParts = importString.split("\\.");
+    String importedName = importedPathParts[importedPathParts.length - 1];
+    Set<String> set = new HashSet<String>();
+    if (!importedName.equals("*")) {
+      set.add(importString);
+    } else {
+      PsiReference[] references = getReferences();
+      for (PsiReference reference : references) {
+        if (!(reference instanceof CfmlComponentReference)) {
+          continue;
+        }
+        ResolveResult[] results = ((CfmlComponentReference)reference).multiResolve(false);
+        for (ResolveResult result : results) {
+          PsiElement element = result.getElement();
+          if (element instanceof CfmlComponent) {
+            CfmlComponent component = (CfmlComponent)element;
+            String packagePath = String.join(".", Arrays.copyOfRange(importedPathParts, 0, importedPathParts.length - 1));
+            set.add(packagePath + "." + component.getName());
+          }
+        }
+      }
+    }
+    return set;
+  }
 
   @Nullable
   String getPrefix();
diff --git a/CFML/src/com/intellij/coldFusion/model/psi/CfmlParameter.java b/CFML/src/com/intellij/coldFusion/model/psi/CfmlParameter.java
index af54a01dc56..f521cf26d7b 100755
--- a/CFML/src/com/intellij/coldFusion/model/psi/CfmlParameter.java
+++ b/CFML/src/com/intellij/coldFusion/model/psi/CfmlParameter.java
@@ -11,9 +11,15 @@ public interface CfmlParameter extends PsiElement, PsiNamedElement {
 
   @Nullable
   String getType();
+  
+  @Nullable
+  String getDefault();
 
   @Override
   @Nullable
   @NonNls
   String getName();
+  
+  @Nullable
+  String getDescription();
 }
diff --git a/CFML/src/com/intellij/coldFusion/model/psi/CfmlProperty.java b/CFML/src/com/intellij/coldFusion/model/psi/CfmlProperty.java
index 060d79f3448..afb0525bdac 100644
--- a/CFML/src/com/intellij/coldFusion/model/psi/CfmlProperty.java
+++ b/CFML/src/com/intellij/coldFusion/model/psi/CfmlProperty.java
@@ -15,19 +15,33 @@
  */
 package com.intellij.coldFusion.model.psi;
 
+import com.intellij.coldFusion.model.info.CfmlPropertyDescription;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
  * @author vnikolaenko
  * @date 09.02.11
  */
-public interface CfmlProperty extends CfmlPsiElement, CfmlVariable {
+public interface CfmlProperty extends CfmlPsiElement, CfmlTypedVariable {
   CfmlProperty[] EMPTY_ARRAY = new CfmlProperty[0];
 
   boolean hasGetter();
 
   boolean hasSetter();
 
+  String getDefault();
+
   @Nullable
   CfmlComponent getComponent();
+
+  @Nullable
+  String getDescription();
+
+  @Override
+  @NotNull
+  String getName();
+
+  @NotNull
+  CfmlPropertyDescription getPropertyInfo();
 }
diff --git a/CFML/src/com/intellij/coldFusion/model/psi/CfmlTypedVariable.java b/CFML/src/com/intellij/coldFusion/model/psi/CfmlTypedVariable.java
new file mode 100644
index 00000000000..dc429bef039
--- /dev/null
+++ b/CFML/src/com/intellij/coldFusion/model/psi/CfmlTypedVariable.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2000-2020 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.coldFusion.model.psi;
+
+import com.intellij.coldFusion.model.CfmlUtil;
+import com.intellij.coldFusion.model.files.CfmlFile;
+import com.intellij.psi.PsiType;
+import org.jetbrains.annotations.Nullable;
+
+public interface CfmlTypedVariable extends CfmlVariable {
+
+  @Nullable
+  default PsiType getPsiType() {
+    String typeName = getType();
+    if (typeName == null) return null;
+    CfmlFile file = getContainingFile();
+    return CfmlUtil.getTypeFromName(file, typeName, getProject());
+  }
+
+  @Override
+  CfmlFile getContainingFile();
+
+  @Nullable
+  String getType();
+}
diff --git a/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlComponentImpl.java b/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlComponentImpl.java
index 4da5fdfa142..3914c3eed1e 100755
--- a/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlComponentImpl.java
+++ b/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlComponentImpl.java
@@ -16,6 +16,7 @@
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * @author vnikolaenko
@@ -42,6 +43,12 @@ public String getName() {
     return "";
   }
 
+  @Nullable
+  @Override
+  public String getDescription() {
+    return null;
+  }
+
   @Override
   @NotNull
   public CfmlFunction[] getFunctions() {
diff --git a/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlForImpl.java b/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlForImpl.java
index 974071f4828..60d733718eb 100644
--- a/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlForImpl.java
+++ b/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlForImpl.java
@@ -16,13 +16,10 @@
 package com.intellij.coldFusion.model.psi.impl;
 
 import com.intellij.coldFusion.model.lexer.CfscriptTokenTypes;
-import com.intellij.coldFusion.model.psi.CfmlAssignmentExpression;
-import com.intellij.coldFusion.model.psi.CfmlCompositeElement;
-import com.intellij.coldFusion.model.psi.CfmlVariable;
+import com.intellij.coldFusion.model.parsers.CfmlElementTypes;
+import com.intellij.coldFusion.model.psi.*;
 import com.intellij.lang.ASTNode;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiType;
-import com.intellij.psi.ResolveState;
+import com.intellij.psi.*;
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NonNls;
@@ -43,7 +40,18 @@ public Variable(@NotNull ASTNode node) {
 
     @Override
     public PsiType getPsiType() {
-      return null;
+      PsiElement in_keyword = getNextSibling();
+      while (in_keyword instanceof PsiWhiteSpace) {
+        in_keyword = in_keyword.getNextSibling();
+      }
+      if (in_keyword.getNode().getElementType() != CfscriptTokenTypes.IN_L) return null;
+      PsiElement arrayReference = in_keyword.getNextSibling();
+      while (arrayReference instanceof PsiWhiteSpace) {
+        arrayReference = arrayReference.getNextSibling();
+      }
+      if (!(arrayReference instanceof CfmlTypedElement)) return null;
+      PsiType type = ((CfmlTypedElement)arrayReference).getPsiType();
+      return type instanceof PsiArrayType ? ((PsiArrayType)type).getComponentType() : null;
     }
 
     @Override
diff --git a/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlFunctionImpl.java b/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlFunctionImpl.java
index 13e31a4b39f..8782386496d 100644
--- a/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlFunctionImpl.java
+++ b/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlFunctionImpl.java
@@ -79,10 +79,23 @@ public CfmlParametersList getParametersList() {
 
   @Override
   @Nullable
-  public PsiType getReturnType() {
+  public String getReturnTypeName() {
     final PsiElement type = findChildByType(CfmlElementTypes.TYPE);
-    return type != null ?
-           new CfmlComponentType(type.getText(), getContainingFile(), getProject()) : null;
+    if (type == null) return null;
+    return type.getText();
+  }
+
+  @Nullable
+  @Override
+  public String getDescription() {
+    PsiElement previousSibling = getPrevSibling();
+    while (previousSibling instanceof PsiWhiteSpace) {
+      previousSibling = previousSibling.getPrevSibling();
+    }
+    if (!(previousSibling instanceof PsiComment)) {
+      return null;
+    }
+    return previousSibling.getText();
   }
 
   @Override
diff --git a/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlFunctionParameterImpl.java b/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlFunctionParameterImpl.java
index b1b77f7bec6..af39e2cd92d 100644
--- a/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlFunctionParameterImpl.java
+++ b/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlFunctionParameterImpl.java
@@ -5,20 +5,19 @@
 import com.intellij.coldFusion.model.CfmlScopesInfo;
 import com.intellij.coldFusion.model.lexer.CfscriptTokenTypes;
 import com.intellij.coldFusion.model.parsers.CfmlElementTypes;
-import com.intellij.coldFusion.model.psi.CfmlCompositeElement;
-import com.intellij.coldFusion.model.psi.CfmlParameter;
-import com.intellij.coldFusion.model.psi.CfmlVariable;
+import com.intellij.coldFusion.model.psi.*;
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiType;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * @author vnikolaenko
  */
-public class CfmlFunctionParameterImpl extends CfmlCompositeElement implements CfmlParameter, CfmlVariable {
+public class CfmlFunctionParameterImpl extends CfmlCompositeElement implements CfmlParameter, CfmlTypedVariable {
   public static final CfmlFunctionParameterImpl[] EMPTY_ARRAY = new CfmlFunctionParameterImpl[0];
 
   public CfmlFunctionParameterImpl(@NotNull ASTNode node) {
@@ -30,11 +29,6 @@ public PsiElement setName(@NonNls @NotNull String name) throws IncorrectOperatio
     throw new IncorrectOperationException();
   }
 
-  @Override
-  public PsiType getPsiType() {
-    return null;
-  }
-
   @NotNull
   @Override
   public String getName() {
@@ -45,6 +39,12 @@ public String getName() {
     return "";
   }
 
+  @Nullable
+  @Override
+  public String getDescription() {
+    return null;
+  }
+
   @Override
   public boolean isRequired() {
     final PsiElement element = findChildByType(CfscriptTokenTypes.REQUIRED_KEYWORD);
@@ -60,6 +60,14 @@ public String getType() {
     return null;
   }
 
+  public String getDefault() {
+    final PsiElement defaultElement = findChildByType(CfmlElementTypes.VALUE);
+    if (defaultElement != null) {
+      return defaultElement.getText();
+    }
+    return null;
+  }
+
   @Override
   public int getProvidedScope() {
     return CfmlScopesInfo.ARGUMENTS_SCOPE;
diff --git a/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlImportImpl.java b/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlImportImpl.java
index 5e181dbc8a5..155bc9104fb 100644
--- a/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlImportImpl.java
+++ b/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlImportImpl.java
@@ -15,13 +15,17 @@
  */
 package com.intellij.coldFusion.model.psi.impl;
 
+import com.intellij.coldFusion.model.psi.CfmlComponent;
 import com.intellij.coldFusion.model.psi.CfmlComponentReference;
 import com.intellij.coldFusion.model.psi.CfmlImport;
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiReference;
+import com.intellij.psi.ResolveResult;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Objects;
+
 /**
  * @author vnikolaenko
  * @date 16.02.11
@@ -31,16 +35,18 @@ public CfmlImportImpl(ASTNode astNode) {
     super(astNode);
   }
 
-  @Override
-  public boolean isImported(String componentName) {
-    String importString = getImportString();
-    return importString != null ? importString.endsWith(componentName) : false;
-  }
-
   @Override
   public String getImportString() {
+    String retval = null;
     PsiElement taglib = getAttributeValueElement("taglib");
-    return taglib != null ? taglib.getText() : null;
+    if (taglib != null) {
+      retval = taglib.getText();
+    }
+    PsiElement path = getAttributeValueElement("path");
+    if (path != null) {
+      retval = path.getText();
+    }
+    return retval;
   }
 
   @Override
@@ -52,9 +58,12 @@ public String getPrefix() {
   @NotNull
   @Override
   public PsiReference[] getReferences() {
-    PsiElement taglib = getAttributeValueElement("taglib");
-    if (taglib != null) {
-      return new PsiReference[]{new CfmlComponentReference(taglib.getNode(), this)};
+    PsiElement valueNode = getAttributeValueElement("taglib");
+    if (valueNode == null) {
+      valueNode = getAttributeValueElement("path");
+    }
+    if (valueNode != null) {
+      return new PsiReference[]{new CfmlComponentReference(valueNode.getNode(), this)};
     }
     return super.getReferences();
   }
diff --git a/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlPropertyImpl.java b/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlPropertyImpl.java
index 2b7c20f0484..8e5a8d6fc2f 100644
--- a/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlPropertyImpl.java
+++ b/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlPropertyImpl.java
@@ -15,17 +15,19 @@
  */
 package com.intellij.coldFusion.model.psi.impl;
 
+import com.intellij.coldFusion.UI.CfmlLookUpItemUtil;
+import com.intellij.coldFusion.model.info.CfmlPropertyDescription;
 import com.intellij.coldFusion.model.lexer.CfscriptTokenTypes;
-import com.intellij.coldFusion.model.psi.CfmlComponent;
-import com.intellij.coldFusion.model.psi.CfmlCompositeElement;
-import com.intellij.coldFusion.model.psi.CfmlProperty;
+import com.intellij.coldFusion.model.psi.*;
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiType;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collection;
 
 /**
  * @author vnikolaenko
@@ -47,6 +49,12 @@ public String getName() {
     return nameIdentifier != null ? nameIdentifier.getText() : "";
   }
 
+  @NotNull
+  @Override
+  public CfmlPropertyDescription getPropertyInfo() {
+    return CfmlLookUpItemUtil.getPropertyDescription(this);
+  }
+
   @Override
   public PsiElement getNameIdentifier() {
     PsiElement lastChild = getLastChild();
@@ -71,14 +79,56 @@ public PsiElement setName(@NonNls @NotNull String name) throws IncorrectOperatio
     throw new IncorrectOperationException();
   }
 
+  private boolean checkAccessorAttribute(String accessorName) {
+    CfmlAttributeImpl attributeValue = getNamedAttribute(accessorName);
+    if (attributeValue != null) {
+      if ("true".equalsIgnoreCase(attributeValue.getPureAttributeValue())) {
+        return true;
+      }
+      return false;
+    }
+
+    CfmlComponent component = getComponent();
+    return component != null && component.hasImplicitAccessors();
+  }
+
   @Override
   public boolean hasGetter() {
-    return false;
+    return checkAccessorAttribute("getter");
   }
 
   @Override
   public boolean hasSetter() {
-    return false;
+    return checkAccessorAttribute("setter");
+  }
+
+  private CfmlAttributeImpl getNamedAttribute(String attributeName) {
+    Collection<CfmlAttributeImpl> namedAttribute = PsiTreeUtil.findChildrenOfType(this, CfmlAttributeImpl.class);
+    for (CfmlAttributeImpl attribute : namedAttribute) {
+      if (attributeName.equals(attribute.getName())) {
+        return attribute;
+      }
+    }
+    return null;
+  }
+  public CfmlAttributeImpl getTypeIdentifier() {
+    return getNamedAttribute("type");
+  }
+
+  @Override
+  public String getType() {
+    CfmlAttributeImpl identifier = getTypeIdentifier();
+    return identifier != null ? identifier.getPureAttributeValue() : null;
+  }
+
+  public CfmlAttributeImpl getDefaultIdentifier() {
+    return getNamedAttribute("default");
+  }
+  
+  @Override
+  public String getDefault() {
+    CfmlAttributeImpl identifier = getDefaultIdentifier();
+    return identifier != null ? identifier.getPureAttributeValue() : null;
   }
 
   @Override
@@ -86,8 +136,9 @@ public CfmlComponent getComponent() {
     return PsiTreeUtil.getParentOfType(this, CfmlComponent.class);
   }
 
+  @Nullable
   @Override
-  public PsiType getPsiType() {
+  public String getDescription() {
     return null;
   }
 
diff --git a/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlScriptImportImpl.java b/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlScriptImportImpl.java
index 59b4df39d56..cf07870c8fa 100644
--- a/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlScriptImportImpl.java
+++ b/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlScriptImportImpl.java
@@ -15,13 +15,17 @@
  */
 package com.intellij.coldFusion.model.psi.impl;
 
-import com.intellij.coldFusion.model.psi.CfmlCompositeElement;
-import com.intellij.coldFusion.model.psi.CfmlImport;
-import com.intellij.coldFusion.model.psi.CfmlStringLiteralExpression;
+import com.intellij.coldFusion.model.parsers.CfmlElementTypes;
+import com.intellij.coldFusion.model.psi.*;
 import com.intellij.lang.ASTNode;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiReference;
+import com.intellij.psi.ResolveResult;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.Objects;
+
 /**
  * @author vnikolaenko
  * @date 16.02.11
@@ -31,18 +35,12 @@ public CfmlScriptImportImpl(@NotNull ASTNode node) {
     super(node);
   }
 
-  @Override
-  public boolean isImported(String componentName) {
-    String importString = getImportString();
-    return importString != null ? importString.endsWith(componentName) : false;
-  }
-
   @Override
   @Nullable
   public String getImportString() {
-    CfmlStringLiteralExpression childByType = findChildByClass(CfmlStringLiteralExpression.class);
-    if (childByType != null) {
-      return childByType.getValue();
+    CfmlComponentReference referenceChild = findChildByType(CfmlElementTypes.COMPONENT_REFERENCE);
+    if (referenceChild != null) {
+      return referenceChild.getText();
     }
     return null;
   }
@@ -52,15 +50,13 @@ public String getPrefix() {
     return null;
   }
 
-  /*
   @NotNull
   @Override
   public PsiReference[] getReferences() {
-    PsiElement reference = findChildByType(CfscriptElementTypes.COMPONENT_REFERENCE);
+    PsiElement reference = findChildByType(CfmlElementTypes.COMPONENT_REFERENCE);
     if (reference != null) {
-      return new PsiReference[]{new CfmlComponentReference( reference.getNode(), this)};
+      return new PsiReference[]{new CfmlComponentReference(reference.getNode(), this)};
     }
     return super.getReferences();
   }
-  */
 }
diff --git a/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlTagComponentImpl.java b/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlTagComponentImpl.java
index 4c2b7f69c69..ee16b49601b 100755
--- a/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlTagComponentImpl.java
+++ b/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlTagComponentImpl.java
@@ -35,6 +35,12 @@ public String getName() {
     return !StringUtil.isEmpty(nameFromFile) ? nameFromFile : (name != null ? name : "");
   }
 
+  @Nullable
+  @Override
+  public String getDescription() {
+    return CfmlPsiUtil.getPureAttributeValue(this, "hint");
+  }
+
   @Override
   public PsiElement setName(@NonNls @NotNull String name) throws IncorrectOperationException {
     return null;
diff --git a/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlTagFunctionImpl.java b/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlTagFunctionImpl.java
index 50b0add55ad..a81603d77bb 100644
--- a/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlTagFunctionImpl.java
+++ b/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlTagFunctionImpl.java
@@ -38,10 +38,14 @@ public CfmlParameter[] getParameters() {
 
   @Override
   @Nullable
-  public PsiType getReturnType() {
-    final String returnTypeString = CfmlPsiUtil.getPureAttributeValue(this, "returntype");
-    return returnTypeString != null ?
-           new CfmlComponentType(returnTypeString, getContainingFile(), getProject()) : null;
+  public String getReturnTypeName() {
+    return CfmlPsiUtil.getPureAttributeValue(this, "returntype");
+  }
+
+  @Override
+  @Nullable
+  public String getDescription() {
+    return CfmlPsiUtil.getPureAttributeValue(this, "hint");
   }
 
   @Override
diff --git a/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlTagFunctionParameterImpl.java b/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlTagFunctionParameterImpl.java
index 53dcf427cae..9d6a6976be7 100755
--- a/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlTagFunctionParameterImpl.java
+++ b/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlTagFunctionParameterImpl.java
@@ -2,9 +2,7 @@
 package com.intellij.coldFusion.model.psi.impl;
 
 import com.intellij.coldFusion.model.CfmlScopesInfo;
-import com.intellij.coldFusion.model.psi.CfmlParameter;
-import com.intellij.coldFusion.model.psi.CfmlPsiUtil;
-import com.intellij.coldFusion.model.psi.CfmlVariable;
+import com.intellij.coldFusion.model.psi.*;
 import com.intellij.lang.ASTNode;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.PsiElement;
@@ -15,8 +13,9 @@
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
-public class CfmlTagFunctionParameterImpl extends CfmlTagImpl implements CfmlParameter, CfmlVariable {
+public class CfmlTagFunctionParameterImpl extends CfmlTagImpl implements CfmlParameter, CfmlTypedVariable {
   public final static String TAG_NAME = "cfargument";
 
   public CfmlTagFunctionParameterImpl(ASTNode astNode) {
@@ -43,6 +42,12 @@ public String getName() {
     return "";
   }
 
+  @Nullable
+  @Override
+  public String getDescription() {
+    return CfmlPsiUtil.getPureAttributeValue(this, "hint");
+  }
+
   @Override
   public boolean isRequired() {
     String requiredAttr = CfmlPsiUtil.getPureAttributeValue(this, "required");
@@ -57,6 +62,11 @@ public boolean isRequired() {
   public String getType() {
     return CfmlPsiUtil.getPureAttributeValue(this, "type");
   }
+  
+  @Override
+  public String getDefault() {
+    return CfmlPsiUtil.getPureAttributeValue(this, "default");
+  }
 
   @Override
   public int getProvidedScope() {
@@ -95,11 +105,6 @@ public boolean processDeclarations(@NotNull PsiScopeProcessor processor,
     return processor.execute(this, state);
   }
 
-  @Override
-  public PsiType getPsiType() {
-    return null;
-  }
-
   @Override
   public boolean isTrulyDeclaration() {
     return true;
diff --git a/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlTagLoopImpl.java b/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlTagLoopImpl.java
index ad88d6d032e..b12626056c9 100644
--- a/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlTagLoopImpl.java
+++ b/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlTagLoopImpl.java
@@ -2,14 +2,9 @@
 package com.intellij.coldFusion.model.psi.impl;
 
 import com.intellij.coldFusion.model.parsers.CfmlElementTypes;
-import com.intellij.coldFusion.model.psi.CfmlPsiUtil;
-import com.intellij.coldFusion.model.psi.CfmlRecursiveElementVisitor;
-import com.intellij.coldFusion.model.psi.CfmlVariable;
+import com.intellij.coldFusion.model.psi.*;
 import com.intellij.lang.ASTNode;
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.PsiElementVisitor;
-import com.intellij.psi.PsiType;
-import com.intellij.psi.ResolveState;
+import com.intellij.psi.*;
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NonNls;
@@ -31,13 +26,22 @@ public Variable(@NotNull ASTNode node) {
 
     @Override
     public PsiType getPsiType() {
-      return null;
+      PsiElement parent = getParent();
+      if (!(parent instanceof CfmlTagLoopImpl)) return null;
+      PsiElement arrayReference = ((CfmlTagLoopImpl)parent).getArrayReferenceExpression();
+      if (!(arrayReference instanceof CfmlTypedElement)) return null;
+      PsiType type = ((CfmlTypedElement)arrayReference).getPsiType();
+      return type instanceof PsiArrayType ? ((PsiArrayType)type).getComponentType() : null;
     }
 
     @NotNull
     @Override
     public String getName() {
-      return getNameIdentifier().getText();
+      String name = getNameIdentifier().getText();
+      if (name.startsWith("local.")) {
+        name = name.substring(6);
+      }
+      return name;
     }
 
     @Override
@@ -89,6 +93,15 @@ public boolean processDeclarations(@NotNull PsiScopeProcessor processor,
     }
     return CfmlPsiUtil.processDeclarations(processor, state, lastParent, this);
   }
+  
+   CfmlExpression getArrayReferenceExpression () {
+     PsiElement valueElement = getAttributeValueElement("array");
+     if (valueElement == null) return null;
+     for (PsiElement cur = valueElement.getFirstChild(); cur != null; cur = cur.getNextSibling()) {
+       if (cur instanceof CfmlExpression) return (CfmlExpression)cur;
+     }
+     return null;
+  }
 
   @Override
   @NotNull
diff --git a/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlTagParamImpl.java b/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlTagParamImpl.java
new file mode 100644
index 00000000000..e1b3a0a0217
--- /dev/null
+++ b/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlTagParamImpl.java
@@ -0,0 +1,138 @@
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+package com.intellij.coldFusion.model.psi.impl;
+
+import com.intellij.coldFusion.model.CfmlScopesInfo;
+import com.intellij.coldFusion.model.CfmlUtil;
+import com.intellij.coldFusion.model.psi.CfmlComponentType;
+import com.intellij.coldFusion.model.psi.CfmlPsiUtil;
+import com.intellij.coldFusion.model.psi.CfmlVariable;
+import com.intellij.lang.ASTNode;
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiType;
+import com.intellij.psi.ResolveState;
+import com.intellij.psi.impl.CheckUtil;
+import com.intellij.psi.scope.PsiScopeProcessor;
+import com.intellij.util.ArrayUtil;
+import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class CfmlTagParamImpl extends CfmlTagImpl implements CfmlVariable {
+  public final static String TAG_NAME = "cfparam";
+
+  public CfmlTagParamImpl(ASTNode astNode) {
+    super(astNode);
+  }
+
+  @Override
+  public PsiElement setName(@NonNls @NotNull String name) throws IncorrectOperationException {
+    CheckUtil.checkWritable(this);
+    CfmlAttributeNameImpl childByClass = findChildByClass(CfmlAttributeNameImpl.class);
+    if (childByClass != null) {
+      childByClass.setName(name);
+    }
+    return this;
+  }
+  
+  private String[] getScopeNameSplit() {
+    final CfmlAttributeNameImpl attribute = findChildByClass(CfmlAttributeNameImpl.class);
+    if (attribute == null) {
+      return new String[]{null, ""};
+    }
+    String name = attribute.getName();
+    String[] split = name.split("\\.", 1);
+    if (split.length > 1 && ArrayUtil.find(CfmlUtil.getVariableScopes(getProject()), split[0]) > -1) {
+      return split;
+    }
+    return new String[]{null, name};
+  }
+  
+  @NotNull
+  @Override
+  public String getName() {
+    return getScopeNameSplit()[1];
+  }
+
+  @Nullable
+  public String getDescription() {
+    return CfmlPsiUtil.getPureAttributeValue(this, "hint");
+  }
+
+  public boolean isRequired() {
+    String requiredAttr = CfmlPsiUtil.getPureAttributeValue(this, "required");
+    if (requiredAttr == null) {
+      return false;
+    }
+    requiredAttr = StringUtil.toLowerCase(requiredAttr);
+    return "yes".equals(requiredAttr) || "true".equals(requiredAttr);
+  }
+
+  public String getType() {
+    return CfmlPsiUtil.getPureAttributeValue(this, "type");
+  }
+
+  @Override
+  public int getProvidedScope() {
+    return CfmlScopesInfo.getScopeByString(getScopeNameSplit()[0]);
+  }
+
+  @Override
+  @NotNull
+  public String getTagName() {
+    return TAG_NAME;
+  }
+
+  @Override
+  public PsiElement getNameIdentifier() {
+    return getNavigationElement();
+  }
+
+  @NotNull
+  @Override
+  public PsiElement getNavigationElement() {
+    final PsiElement parameterName = findChildByClass(CfmlAttributeNameImpl.class);
+    if (parameterName != null) {
+      PsiElement navigationElement = parameterName.getNavigationElement();
+      if (navigationElement != null) {
+        return navigationElement;
+      }
+    }
+    return super.getNavigationElement();
+  }
+
+  @Override
+  public boolean processDeclarations(@NotNull PsiScopeProcessor processor,
+                                     @NotNull ResolveState state,
+                                     PsiElement lastParent,
+                                     @NotNull PsiElement place) {
+    return processor.execute(this, state);
+  }
+
+  @Override
+  public PsiType getPsiType() {
+    final String returnTypeString = this.getType();
+    return returnTypeString != null ?
+           new CfmlComponentType(returnTypeString, getContainingFile(), getProject()) : null;
+  }
+
+  @Override
+  public boolean isTrulyDeclaration() {
+    return false;
+  }
+
+  @NotNull
+  @Override
+  public String getlookUpString() {
+    return getName();
+  }
+
+  @Override
+  public int getTextOffset() {
+    if (getNavigationElement() == this) {
+      return super.getTextOffset();
+    }
+    return getNavigationElement().getTextOffset();
+  }
+}
diff --git a/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlTagPropertyImpl.java b/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlTagPropertyImpl.java
index deb34639beb..90de0fe6974 100644
--- a/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlTagPropertyImpl.java
+++ b/CFML/src/com/intellij/coldFusion/model/psi/impl/CfmlTagPropertyImpl.java
@@ -15,8 +15,12 @@
  */
 package com.intellij.coldFusion.model.psi.impl;
 
+import com.intellij.coldFusion.UI.CfmlLookUpItemUtil;
+import com.intellij.coldFusion.model.info.CfmlPropertyDescription;
 import com.intellij.coldFusion.model.psi.CfmlComponent;
+import com.intellij.coldFusion.model.psi.CfmlComponentType;
 import com.intellij.coldFusion.model.psi.CfmlProperty;
+import com.intellij.coldFusion.model.psi.CfmlPsiUtil;
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiType;
@@ -56,6 +60,18 @@ public CfmlComponent getComponent() {
     return PsiTreeUtil.findChildOfType(this, CfmlComponent.class);
   }
 
+  @Nullable
+  @Override
+  public String getDescription() {
+    return CfmlPsiUtil.getPureAttributeValue(this, "hint");
+  }
+
+  @NotNull
+  @Override
+  public CfmlPropertyDescription getPropertyInfo() {
+    return CfmlLookUpItemUtil.getPropertyDescription(this);
+  }
+
   private boolean checkBooleanAttribute(String attributeName) {
     PsiElement attributeValue = getAttributeValueElement(attributeName);
     if (attributeValue != null) {
@@ -66,7 +82,7 @@ private boolean checkBooleanAttribute(String attributeName) {
     }
 
     CfmlComponent component = getComponent();
-    return component != null ? component.hasImplicitAccessors() : false;
+    return component != null && component.hasImplicitAccessors();
   }
 
   @Override
@@ -80,8 +96,13 @@ public boolean hasSetter() {
   }
 
   @Override
-  public PsiType getPsiType() {
-    return null;
+  public String getType() {
+    return CfmlPsiUtil.getPureAttributeValue(this, "type");
+  }
+
+  @Override
+  public String getDefault() {
+    return CfmlPsiUtil.getPureAttributeValue(this, "default");
   }
 
   @NotNull
diff --git a/CFML/src/com/intellij/coldFusion/navigation/actions/CfmlTypeDeclarationProvider.java b/CFML/src/com/intellij/coldFusion/navigation/actions/CfmlTypeDeclarationProvider.java
new file mode 100644
index 00000000000..57d8d252749
--- /dev/null
+++ b/CFML/src/com/intellij/coldFusion/navigation/actions/CfmlTypeDeclarationProvider.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2000-2020 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.coldFusion.navigation.actions;
+
+import com.intellij.codeInsight.TargetElementUtil;
+import com.intellij.codeInsight.navigation.actions.TypeDeclarationPlaceAwareProvider;
+import com.intellij.coldFusion.model.psi.*;
+import com.intellij.openapi.editor.Editor;
+import com.intellij.psi.*;
+import com.intellij.psi.util.PsiUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collection;
+
+public class CfmlTypeDeclarationProvider implements TypeDeclarationPlaceAwareProvider {
+  @Nullable
+  @Override
+  public PsiElement[] getSymbolTypeDeclarations(@NotNull PsiElement targetElement, Editor editor, int offset) {
+    PsiType type = null;
+    if (targetElement instanceof CfmlVariable) {
+      type = ((CfmlVariable)targetElement).getPsiType();
+    } else if (targetElement instanceof CfmlFunction) {
+      type = ((CfmlFunction)targetElement).getReturnType();
+    }
+    if (type == null) return null;
+    if (type instanceof PsiArrayType) {
+      type = ((PsiArrayType)type).getComponentType();
+    }
+    if (type instanceof CfmlComponentType) {
+      Collection<CfmlComponent> resolveResults = ((CfmlComponentType)type).resolve();
+      return resolveResults.size() > 0 ? resolveResults.toArray(new PsiElement[0]) : null;
+    }
+    return null;
+  }
+
+  @Nullable
+  @Override
+  public PsiElement[] getSymbolTypeDeclarations(@NotNull PsiElement symbol) {
+    return getSymbolTypeDeclarations(symbol, null, -1);
+  }
+}
diff --git a/CFML/src/messages/CfmlBundle.properties b/CFML/src/messages/CfmlBundle.properties
index c037441b0d3..d454e2751e4 100644
--- a/CFML/src/messages/CfmlBundle.properties
+++ b/CFML/src/messages/CfmlBundle.properties
@@ -2,7 +2,6 @@ cfml.parsing.tag.is.not.done=Tag is not done
 cfml.parsing.unexpected.token=Unexpected token
 cfml.parsing.element.is.not.closed=Element {0} is not closed
 cfml.parsing.no.such.attribute=No such attribute provided for {0} tag
-cfml.parsing.no.value=No value specified
 cfml.parsing.string.value.required=String value required
 cfml.parsing.numeric.value.required=Numeric value required
 cfml.parsing.expression.unclosed=Unclosed expression
diff --git a/CFML/tests/com/intellij/coldFusion/CfmlStorageStateTest.java b/CFML/tests/com/intellij/coldFusion/CfmlStorageStateTest.java
index 6b053f5a471..c5ad57f4fe2 100644
--- a/CFML/tests/com/intellij/coldFusion/CfmlStorageStateTest.java
+++ b/CFML/tests/com/intellij/coldFusion/CfmlStorageStateTest.java
@@ -6,7 +6,7 @@
 import com.intellij.openapi.util.JDOMUtil;
 import com.intellij.testFramework.fixtures.CodeInsightFixtureTestCase;
 
-import static com.intellij.testFramework.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
 
 /**
  * @author Nadya Zabrodina