diff --git a/python/ipnb/src/org/jetbrains/plugins/ipnb/psi/IpnbPyTargetExpression.java b/python/ipnb/src/org/jetbrains/plugins/ipnb/psi/IpnbPyTargetExpression.java
index 62f39a96cbb5..eafa44b41f81 100644
--- a/python/ipnb/src/org/jetbrains/plugins/ipnb/psi/IpnbPyTargetExpression.java
+++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/psi/IpnbPyTargetExpression.java
@@ -4,6 +4,7 @@ import com.intellij.lang.ASTNode;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.util.ui.UIUtil;
 import com.jetbrains.python.psi.impl.PyTargetExpressionImpl;
+import com.jetbrains.python.psi.stubs.PyTargetExpressionStub;
 import org.jetbrains.plugins.ipnb.editor.IpnbFileEditor;
 import org.jetbrains.plugins.ipnb.editor.panels.IpnbFilePanel;
 import org.jetbrains.plugins.ipnb.editor.panels.code.IpnbCodePanel;
@@ -15,6 +16,10 @@ public class IpnbPyTargetExpression extends PyTargetExpressionImpl {
     super(astNode);
   }
 
+  public IpnbPyTargetExpression(final PyTargetExpressionStub stub) {
+    super(stub, IpnbPyTokenTypes.IPNB_TARGET);
+  }
+
   @Override
   public void navigate(boolean requestFocus) {
     final IpnbCodeSourcePanel sourcePanel = ((IpnbPyFragment)getContainingFile()).getCodeSourcePanel();
diff --git a/python/ipnb/src/org/jetbrains/plugins/ipnb/psi/IpnbPyTargetExpressionElementType.java b/python/ipnb/src/org/jetbrains/plugins/ipnb/psi/IpnbPyTargetExpressionElementType.java
new file mode 100644
index 000000000000..07cdf7d52868
--- /dev/null
+++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/psi/IpnbPyTargetExpressionElementType.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2000-2014 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 org.jetbrains.plugins.ipnb.psi;
+
+import com.intellij.lang.ASTNode;
+import com.intellij.psi.PsiElement;
+import com.jetbrains.python.psi.PyTargetExpression;
+import com.jetbrains.python.psi.impl.stubs.PyTargetExpressionElementType;
+import com.jetbrains.python.psi.stubs.PyTargetExpressionStub;
+import org.jetbrains.annotations.NotNull;
+
+public class IpnbPyTargetExpressionElementType extends PyTargetExpressionElementType {
+  public IpnbPyTargetExpressionElementType() {
+    super("IPNB_TARGET_EXPRESSION");
+  }
+
+  public PsiElement createElement(@NotNull final ASTNode node) {
+    return new IpnbPyTargetExpression(node);
+  }
+
+  public PyTargetExpression createPsi(@NotNull final PyTargetExpressionStub stub) {
+    return new IpnbPyTargetExpression(stub);
+  }
+
+}
diff --git a/python/ipnb/src/org/jetbrains/plugins/ipnb/psi/IpnbPyTokenTypes.java b/python/ipnb/src/org/jetbrains/plugins/ipnb/psi/IpnbPyTokenTypes.java
index 02f69b054f8f..9e012289463e 100644
--- a/python/ipnb/src/org/jetbrains/plugins/ipnb/psi/IpnbPyTokenTypes.java
+++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/psi/IpnbPyTokenTypes.java
@@ -1,11 +1,14 @@
 package org.jetbrains.plugins.ipnb.psi;
 
 import com.jetbrains.python.psi.PyElementType;
+import com.jetbrains.python.psi.PyStubElementType;
+import com.jetbrains.python.psi.PyTargetExpression;
 import com.jetbrains.python.psi.impl.stubs.PyFunctionElementType;
+import com.jetbrains.python.psi.stubs.PyTargetExpressionStub;
 
 public class IpnbPyTokenTypes {
   public static final PyElementType IPNB_REFERENCE = new PyElementType("IPNB_REFERENCE", IpnbPyReferenceExpression.class);
-  public static final PyElementType IPNB_TARGET = new PyElementType("IPNB_TARGET", IpnbPyTargetExpression.class);
+  public static final PyStubElementType<PyTargetExpressionStub, PyTargetExpression> IPNB_TARGET = new IpnbPyTargetExpressionElementType();
   public static final PyFunctionElementType IPNB_FUNCTION = new IpnbFunctionElementType();
 
   private IpnbPyTokenTypes() {
diff --git a/python/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java b/python/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java
index 2f6f741d192d..7fe837556a3a 100644
--- a/python/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java
+++ b/python/src/com/jetbrains/python/psi/impl/PyTargetExpressionImpl.java
@@ -27,6 +27,7 @@ import com.intellij.psi.ResolveResult;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.LocalSearchScope;
 import com.intellij.psi.search.SearchScope;
+import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.psi.stubs.StubElement;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.QualifiedName;
@@ -75,6 +76,10 @@ public class PyTargetExpressionImpl extends PyBaseElementImpl<PyTargetExpression
     super(stub, PyElementTypes.TARGET_EXPRESSION);
   }
 
+  public PyTargetExpressionImpl(final PyTargetExpressionStub stub, IStubElementType nodeType) {
+    super(stub, nodeType);
+  }
+
   @Override
   protected void acceptPyVisitor(PyElementVisitor pyVisitor) {
     pyVisitor.visitPyTargetExpression(this);
diff --git a/python/src/com/jetbrains/python/psi/impl/stubs/PyTargetExpressionElementType.java b/python/src/com/jetbrains/python/psi/impl/stubs/PyTargetExpressionElementType.java
index ec3aa1deb394..8c7f7568fd9d 100644
--- a/python/src/com/jetbrains/python/psi/impl/stubs/PyTargetExpressionElementType.java
+++ b/python/src/com/jetbrains/python/psi/impl/stubs/PyTargetExpressionElementType.java
@@ -47,6 +47,10 @@ public class PyTargetExpressionElementType extends PyStubElementType<PyTargetExp
     super("TARGET_EXPRESSION");
   }
 
+  public PyTargetExpressionElementType(String debugName) {
+    super(debugName);
+  }
+
   private CustomTargetExpressionStubType[] getCustomStubTypes() {
     if (myCustomStubTypes == null) {
       myCustomStubTypes = Extensions.getExtensions(CustomTargetExpressionStubType.EP_NAME);