diff --git a/apps/sdnip/src/main/java/org/onosproject/sdnip/IntentSynchronizer.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/IntentSynchronizer.java
index cc65ccc..badad7f 100644
--- a/apps/sdnip/src/main/java/org/onosproject/sdnip/IntentSynchronizer.java
+++ b/apps/sdnip/src/main/java/org/onosproject/sdnip/IntentSynchronizer.java
@@ -32,6 +32,7 @@
 import org.onosproject.net.intent.Intent;
 import org.onosproject.net.intent.IntentService;
 import org.onosproject.net.intent.IntentState;
+import org.onosproject.net.intent.Key;
 import org.onosproject.net.intent.MultiPointToSinglePointIntent;
 import org.onosproject.net.intent.PointToPointIntent;
 import org.onosproject.routing.FibListener;
@@ -43,6 +44,7 @@
 import org.slf4j.LoggerFactory;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -62,6 +64,9 @@
  * IntentService.
  */
 public class IntentSynchronizer implements FibListener {
+    private static final int PRIORITY_OFFSET = 100;
+    private static final int PRIORITY_MULTIPLIER = 5;
+
     private static final Logger log =
         LoggerFactory.getLogger(IntentSynchronizer.class);
 
@@ -332,9 +337,14 @@
             selector.matchVlanId(VlanId.ANY);
         }
 
-        return new MultiPointToSinglePointIntent(appId, selector.build(),
+        int priority =
+            prefix.prefixLength() * PRIORITY_MULTIPLIER + PRIORITY_OFFSET;
+        Key key = Key.of(prefix.toString(), appId);
+        return new MultiPointToSinglePointIntent(appId, key, selector.build(),
                                                  treatment.build(),
-                                                 ingressPorts, egressPort);
+                                                 ingressPorts, egressPort,
+                                                 Collections.emptyList(),
+                                                 priority);
     }
 
     @Override
