diff --git a/core/net/src/main/java/org/onosproject/net/pi/impl/PiPipeconfServiceImpl.java b/core/net/src/main/java/org/onosproject/net/pi/impl/PiPipeconfManager.java
similarity index 98%
rename from core/net/src/main/java/org/onosproject/net/pi/impl/PiPipeconfServiceImpl.java
rename to core/net/src/main/java/org/onosproject/net/pi/impl/PiPipeconfManager.java
index 1e66d7f..85d3fc3 100644
--- a/core/net/src/main/java/org/onosproject/net/pi/impl/PiPipeconfServiceImpl.java
+++ b/core/net/src/main/java/org/onosproject/net/pi/impl/PiPipeconfManager.java
@@ -19,6 +19,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.annotations.Beta;
 import com.google.common.collect.ImmutableSet;
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
@@ -64,7 +65,8 @@
  */
 @Component(immediate = true)
 @Service
-public class PiPipeconfServiceImpl implements PiPipeconfService {
+@Beta
+public class PiPipeconfManager implements PiPipeconfService {
 
     private final Logger log = getLogger(getClass());
 
@@ -132,7 +134,7 @@
 
     @Override
     public Iterable<PiPipeconf> getPipeconfs() {
-        throw new UnsupportedOperationException("Currently unsupported");
+        return piPipeconfs.values();
     }
 
     @Override