Index: java/Framclipse/com.framsticks.framclipse.ui/src/com/framsticks/framclipse/ui/FramScriptSourceViewerConfiguration.java
===================================================================
--- java/Framclipse/com.framsticks.framclipse.ui/src/com/framsticks/framclipse/ui/FramScriptSourceViewerConfiguration.java	(revision 437)
+++ java/Framclipse/com.framsticks.framclipse.ui/src/com/framsticks/framclipse/ui/FramScriptSourceViewerConfiguration.java	(revision 438)
@@ -12,8 +12,7 @@
 import org.eclipse.jface.text.source.ISourceViewer;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.xtext.parsetree.AbstractNode;
-import org.eclipse.xtext.parsetree.CompositeNode;
-import org.eclipse.xtext.parsetree.NodeUtil;
-import org.eclipse.xtext.parsetree.ParseTreeUtil;
+import org.eclipse.xtext.nodemodel.ICompositeNode;
+import org.eclipse.xtext.nodemodel.ILeafNode;
+import org.eclipse.xtext.nodemodel.util.NodeModelUtils;
 import org.eclipse.xtext.resource.XtextResource;
 import org.eclipse.xtext.ui.editor.XtextSourceViewerConfiguration;
@@ -62,7 +61,9 @@
 					@Override
 					public String exec(XtextResource state) throws Exception {
-						CompositeNode root = state.getParseResult().getRootNode();
-						AbstractNode current = ParseTreeUtil.getCurrentOrFollowingNodeByOffset(root, offset);
-						EObject semantic = NodeUtil.getNearestSemanticObject(current);
+						ICompositeNode root = state.getParseResult().getRootNode();
+//						AbstractNode current = ParseTreeUtil.getCurrentOrFollowingNodeByOffset(root, offset);
+						ILeafNode current = NodeModelUtils.findLeafNodeAtOffset(root, offset);
+//						EObject semantic = NodeUtil.getNearestSemanticObject(current);
+						EObject semantic = current.getSemanticElement();
 
 						if (semantic instanceof QualifiedExpression) {
Index: java/Framclipse/com.framsticks.framclipse.ui/src/com/framsticks/framclipse/ui/contentassist/FramScriptProposalProvider.java
===================================================================
--- java/Framclipse/com.framsticks.framclipse.ui/src/com/framsticks/framclipse/ui/contentassist/FramScriptProposalProvider.java	(revision 437)
+++ java/Framclipse/com.framsticks.framclipse.ui/src/com/framsticks/framclipse/ui/contentassist/FramScriptProposalProvider.java	(revision 438)
@@ -35,5 +35,5 @@
 
 		protected FramScriptProposalCreator(ContentAssistContext contentAssistContext, String ruleName) {
-			super(contentAssistContext, ruleName);
+			super(contentAssistContext, ruleName, getQualifiedNameConverter());
 			this.cac = contentAssistContext;
 		}
Index: java/Framclipse/com.framsticks.framclipse.ui/src/com/framsticks/framclipse/ui/outline/FramScriptOutlineNodeAdapterFactory.java
===================================================================
--- java/Framclipse/com.framsticks.framclipse.ui/src/com/framsticks/framclipse/ui/outline/FramScriptOutlineNodeAdapterFactory.java	(revision 437)
+++ 	(revision )
@@ -1,22 +1,0 @@
-/*
-* generated by Xtext
-*/
-package com.framsticks.framclipse.ui.outline;
-
-import org.eclipse.xtext.ui.editor.outline.actions.DefaultContentOutlineNodeAdapterFactory;
-
-public class FramScriptOutlineNodeAdapterFactory extends DefaultContentOutlineNodeAdapterFactory {
-
-	private static final Class<?>[] types = { 
-		// provide list of classes to adapt to, e.g.:
-		// Entity.class
-		// Service.class
-	};
-
-	@Override
-	public Class<?>[] getAdapterList() {
-		return types;
-	}
-
-}
-
Index: java/Framclipse/com.framsticks.framclipse.ui/src/com/framsticks/framclipse/ui/outline/FramScriptOutlineTreeProvider.java
===================================================================
--- java/Framclipse/com.framsticks.framclipse.ui/src/com/framsticks/framclipse/ui/outline/FramScriptOutlineTreeProvider.java	(revision 438)
+++ java/Framclipse/com.framsticks.framclipse.ui/src/com/framsticks/framclipse/ui/outline/FramScriptOutlineTreeProvider.java	(revision 438)
@@ -0,0 +1,13 @@
+/*
+ * generated by Xtext
+ */
+package com.framsticks.framclipse.ui.outline;
+
+/**
+ * Customization of the default outline structure.
+ *
+ * See https://www.eclipse.org/Xtext/documentation/304_ide_concepts.html#outline
+ */
+public class FramScriptOutlineTreeProvider extends org.eclipse.xtext.ui.editor.outline.impl.DefaultOutlineTreeProvider {
+	
+}
Index: java/Framclipse/com.framsticks.framclipse.ui/src/com/framsticks/framclipse/ui/outline/FramScriptTransformer.java
===================================================================
--- java/Framclipse/com.framsticks.framclipse.ui/src/com/framsticks/framclipse/ui/outline/FramScriptTransformer.java	(revision 437)
+++ 	(revision )
@@ -1,52 +1,0 @@
-/*
- * generated by Xtext
- */
-package com.framsticks.framclipse.ui.outline;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xtext.ui.editor.outline.transformer.AbstractDeclarativeSemanticModelTransformer;
-
-import com.framsticks.framclipse.framScript.Code;
-import com.framsticks.framclipse.framScript.Function;
-import com.framsticks.framclipse.framScript.Model;
-import com.framsticks.framclipse.framScript.Property;
-import com.framsticks.framclipse.framScript.State;
-import com.framsticks.framclipse.framScript.VariableDeclarations;
-
-/**
- * customization of the default outline structure
- */
-public class FramScriptTransformer extends AbstractDeclarativeSemanticModelTransformer {
-
-	public List<EObject> getChildren(Function e) {
-		return NO_CHILDREN;
-	}
-	
-	public List<EObject> getChildren(Model e) {
-		List<EObject> children = new ArrayList<EObject>();
-		for (EObject child : e.eContents()) {
-			if (child instanceof Code) {
-				addCodeContents(children, (Code) child);
-			} else if (child instanceof Property
-					|| child instanceof State) {
-				children.add(child);
-			}
-		}
-		return children;
-	}
-
-	private void addCodeContents(List<EObject> children, Code code) {
-		if (code != null) {
-			children.addAll(code.getIncludes());
-			EList<VariableDeclarations> globals = code.getGlobals();
-			for (VariableDeclarations declarations : globals) {
-				children.addAll(declarations.getVars());
-			}
-			children.addAll(code.getFunctions());
-		}
-	}
-}
