diff --git a/extensions/entitystore-cassandra/src/main/java/org/qi4j/entitystore/cassandra/CassandraMapEntityStoreMixin.java b/extensions/entitystore-cassandra/src/main/java/org/qi4j/entitystore/cassandra/CassandraMapEntityStoreMixin.java
index 3b0783f..27c7e67 100644
--- a/extensions/entitystore-cassandra/src/main/java/org/qi4j/entitystore/cassandra/CassandraMapEntityStoreMixin.java
+++ b/extensions/entitystore-cassandra/src/main/java/org/qi4j/entitystore/cassandra/CassandraMapEntityStoreMixin.java
@@ -1,7 +1,6 @@
 package org.qi4j.entitystore.cassandra;
 
 import org.apache.cassandra.thrift.*;
-import org.apache.commons.lang.NotImplementedException;
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.thrift.transport.TSocket;
 import org.apache.thrift.transport.TTransport;
@@ -115,7 +114,7 @@
     }
 
     public Input<Reader, IOException> entityStates() {
-          throw new NotImplementedException();
+          throw new UnsupportedOperationException("Not implemented yet");
     }
 
 
diff --git a/libraries/jini/importer/src/main/java/org/qi4j/library/jini/importer/JiniImporter.java b/libraries/jini/importer/src/main/java/org/qi4j/library/jini/importer/JiniImporter.java
index dc53472..5fba734 100644
--- a/libraries/jini/importer/src/main/java/org/qi4j/library/jini/importer/JiniImporter.java
+++ b/libraries/jini/importer/src/main/java/org/qi4j/library/jini/importer/JiniImporter.java
@@ -61,4 +61,10 @@
         JiniProxyHandler jiniHandler = (JiniProxyHandler) Proxy.getInvocationHandler( instance );
         return jiniHandler.isActive();
     }
+
+    public boolean isAvailable( Object instance )
+    {
+        JiniProxyHandler jiniHandler = (JiniProxyHandler) Proxy.getInvocationHandler( instance );
+        return jiniHandler.isActive();
+    }
 }