diff --git a/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java b/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
index c0a2286..ba16d13 100644
--- a/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
+++ b/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
@@ -89,19 +89,19 @@
     private final PacketStoreDelegate delegate = new InternalStoreDelegate();
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    private CoreService coreService;
+    protected CoreService coreService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    private ClusterService clusterService;
+    protected ClusterService clusterService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    private DeviceService deviceService;
+    protected DeviceService deviceService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    private FlowRuleService flowService;
+    protected FlowRuleService flowService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    private PacketStore store;
+    protected PacketStore store;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     private FlowObjectiveService objectiveService;
@@ -112,6 +112,8 @@
 
     private final List<ProcessorEntry> processors = Lists.newCopyOnWriteArrayList();
 
+    private final  PacketDriverProvider defaultProvider = new PacketDriverProvider();
+
     private ApplicationId appId;
     private NodeId localNodeId;
 
@@ -124,6 +126,7 @@
         store.setDelegate(delegate);
         deviceService.addListener(deviceListener);
         store.existingRequests().forEach(this::pushToAllDevices);
+        defaultProvider.init(deviceService);
         log.info("Started");
     }
 
@@ -136,6 +139,11 @@
     }
 
     @Override
+    protected PacketProvider defaultProvider() {
+        return defaultProvider;
+    }
+
+    @Override
     public void addProcessor(PacketProcessor processor, int priority) {
         checkPermission(PACKET_EVENT);
         checkNotNull(processor, "Processor cannot be null");
@@ -374,7 +382,7 @@
     /**
      * Internal callback from the packet store.
      */
-    private class InternalStoreDelegate implements PacketStoreDelegate {
+    protected class InternalStoreDelegate implements PacketStoreDelegate {
         @Override
         public void notify(PacketEvent event) {
             localEmit(event.subject());
