diff --git a/spacy/syntax/_parse_features.pxd b/spacy/syntax/_parse_features.pxd
index 81107e94c..1801d1738 100644
--- a/spacy/syntax/_parse_features.pxd
+++ b/spacy/syntax/_parse_features.pxd
@@ -255,6 +255,4 @@ cpdef enum:
     S1_has_head
     S2_has_head
 
-    ent_type
-
     CONTEXT_SIZE
diff --git a/spacy/syntax/_parse_features.pyx b/spacy/syntax/_parse_features.pyx
index 44030122b..f5f1c6bcb 100644
--- a/spacy/syntax/_parse_features.pyx
+++ b/spacy/syntax/_parse_features.pyx
@@ -104,6 +104,7 @@ cdef int fill_context(atom_t* context, State* state) except -1:
             if state.stack_len >= 3:
                 context[S2_has_head] = has_head(get_s2(state))
 
+
 ner = (
     (N0W,),
     (P1W,),
@@ -176,6 +177,26 @@ ner = (
     (E0W, E1p,),
     (E0p, E1W,),
     (E0p, E1W),
+
+    (P1_ne_iob,),
+    (P1_ne_iob, P1_ne_type),
+    (N0w, P1_ne_iob, P1_ne_type),
+
+    (N0_shape,),
+    (N1_shape,),
+    (N2_shape,),
+    (P1_shape,),
+    (P2_shape,),
+
+    (N0_prefix,),
+    (N0_suffix,),
+
+    (P1_ne_iob,),
+    (P2_ne_iob,),
+    (P1_ne_iob, P2_ne_iob),
+    (P1_ne_iob, P1_ne_type),
+    (P2_ne_iob, P2_ne_type),
+    (N0w, P1_ne_iob, P1_ne_type),
 )