diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/PsiJetPropertyStub.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/PsiJetPropertyStub.java
index bc8b50d00bc..5f2fb7ceb39 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/PsiJetPropertyStub.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/PsiJetPropertyStub.java
@@ -24,4 +24,6 @@ public interface PsiJetPropertyStub extends PsiJetStubWithFqName<JetProperty> {
     boolean hasDelegate();
     boolean hasDelegateExpression();
     boolean hasInitializer();
+    boolean hasReceiverTypeRef();
+    boolean hasReturnTypeRef();
 }
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetPropertyElementType.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetPropertyElementType.java
index 1ad628ebb11..1e238e244c2 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetPropertyElementType.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/elements/JetPropertyElementType.java
@@ -58,6 +58,7 @@ public class JetPropertyElementType extends JetStubElementType<PsiJetPropertyStu
                 parentStub, StringRef.fromString(psi.getName()),
                 psi.isVar(), psi.isTopLevel(), psi.hasDelegate(),
                 psi.hasDelegateExpression(), psi.hasInitializer(),
+                psi.getReceiverTypeRef() != null, psi.getReturnTypeRef() != null,
                 ResolveSessionUtils.safeFqNameForLazyResolve(psi)
         );
     }
@@ -70,6 +71,8 @@ public class JetPropertyElementType extends JetStubElementType<PsiJetPropertyStu
         dataStream.writeBoolean(stub.hasDelegate());
         dataStream.writeBoolean(stub.hasDelegateExpression());
         dataStream.writeBoolean(stub.hasInitializer());
+        dataStream.writeBoolean(stub.hasReceiverTypeRef());
+        dataStream.writeBoolean(stub.hasReturnTypeRef());
 
         FqName fqName = stub.getFqName();
         dataStream.writeName(fqName != null ? fqName.asString() : null);
@@ -84,11 +87,14 @@ public class JetPropertyElementType extends JetStubElementType<PsiJetPropertyStu
         boolean hasDelegate = dataStream.readBoolean();
         boolean hasDelegateExpression = dataStream.readBoolean();
         boolean hasInitializer = dataStream.readBoolean();
+        boolean hasReceiverTypeRef = dataStream.readBoolean();
+        boolean hasReturnTypeRef = dataStream.readBoolean();
 
         StringRef fqNameAsString = dataStream.readName();
         FqName fqName = fqNameAsString != null ? new FqName(fqNameAsString.toString()) : null;
 
-        return new PsiJetPropertyStubImpl(parentStub, name, isVar, isTopLevel, hasDelegate, hasDelegateExpression, hasInitializer, fqName);
+        return new PsiJetPropertyStubImpl(parentStub, name, isVar, isTopLevel, hasDelegate,
+                                          hasDelegateExpression, hasInitializer, hasReceiverTypeRef, hasReturnTypeRef, fqName);
     }
 
     @Override
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetPropertyStubImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetPropertyStubImpl.java
index ea91786a517..c921a03f8ea 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetPropertyStubImpl.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/stubs/impl/PsiJetPropertyStubImpl.java
@@ -32,6 +32,8 @@ public class PsiJetPropertyStubImpl extends StubBase<JetProperty> implements Psi
     private final boolean hasDelegate;
     private final boolean hasDelegateExpression;
     private final boolean hasInitializer;
+    private final boolean hasReceiverTypeRef;
+    private final boolean hasReturnTypeRef;
     private final FqName fqName;
 
     public PsiJetPropertyStubImpl(
@@ -42,6 +44,8 @@ public class PsiJetPropertyStubImpl extends StubBase<JetProperty> implements Psi
             boolean hasDelegate,
             boolean hasDelegateExpression,
             boolean hasInitializer,
+            boolean hasReceiverTypeRef,
+            boolean hasReturnTypeRef,
             @Nullable FqName fqName
     ) {
         super(parent, JetStubElementTypes.PROPERTY);
@@ -59,6 +63,8 @@ public class PsiJetPropertyStubImpl extends StubBase<JetProperty> implements Psi
         this.hasDelegate = hasDelegate;
         this.hasDelegateExpression = hasDelegateExpression;
         this.hasInitializer = hasInitializer;
+        this.hasReceiverTypeRef = hasReceiverTypeRef;
+        this.hasReturnTypeRef = hasReturnTypeRef;
         this.fqName = fqName;
     }
 
@@ -87,6 +93,16 @@ public class PsiJetPropertyStubImpl extends StubBase<JetProperty> implements Psi
         return hasInitializer;
     }
 
+    @Override
+    public boolean hasReceiverTypeRef() {
+        return hasReceiverTypeRef;
+    }
+
+    @Override
+    public boolean hasReturnTypeRef() {
+        return hasReturnTypeRef;
+    }
+
     @Nullable
     @Override
     public FqName getFqName() {