diff --git a/src/main/java/org.onosproject.xran/impl/DefaultXranStore.java b/src/main/java/org.onosproject.xran/impl/DefaultXranStore.java
index d7b9904..279f46d 100644
--- a/src/main/java/org.onosproject.xran/impl/DefaultXranStore.java
+++ b/src/main/java/org.onosproject.xran/impl/DefaultXranStore.java
@@ -182,15 +182,15 @@
     }
 
     @Override
-    public List<RnibCell> getCellNodes() {
-        List<RnibCell> list = Lists.newArrayList();
+    public List<Object> getCellNodes() {
+        List<Object> list = Lists.newArrayList();
         list.addAll(cellMap.values());
         return list;
     }
 
     @Override
-    public List<RnibUe> getUeNodes() {
-        List<RnibUe> list = Lists.newArrayList();
+    public List<Object> getUeNodes() {
+        List<Object> list = Lists.newArrayList();
         list.addAll(ueMap.values());
         return list;
     }
diff --git a/src/main/java/org.onosproject.xran/impl/XranConfig.java b/src/main/java/org.onosproject.xran/impl/XranConfig.java
index 5f59d4d..03cbe13 100644
--- a/src/main/java/org.onosproject.xran/impl/XranConfig.java
+++ b/src/main/java/org.onosproject.xran/impl/XranConfig.java
@@ -24,7 +24,7 @@
 import org.onosproject.xran.codecs.api.ECGI;
 import org.onosproject.xran.codecs.api.EUTRANCellIdentifier;
 import org.onosproject.xran.codecs.api.PLMNIdentity;
-import org.openmuc.jasn1.util.HexConverter;
+import org.onosproject.xran.codecs.util.HexConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;