diff --git a/api-java/.classpath b/api-java/.classpath
index a3ccf85053..301f086c5f 100644
--- a/api-java/.classpath
+++ b/api-java/.classpath
@@ -4,11 +4,6 @@
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="lib" path="dist/api-java.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/akka-kernel">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="akka-kernel/target"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="lib" path="/Users/jboner/src/scala/akka/lib/activation-1.1.jar"/>
 	<classpathentry kind="lib" path="/Users/jboner/src/scala/akka/lib/akka-util-java.jar"/>
 	<classpathentry kind="lib" path="/Users/jboner/src/scala/akka/lib/antlr-3.1.3.jar"/>
diff --git a/api-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java b/api-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java
index 33280f20be..0c45bb676d 100755
--- a/api-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java
+++ b/api-java/src/test/java/se/scalablesolutions/akka/api/InMemoryStateTest.java
@@ -5,8 +5,12 @@
 package se.scalablesolutions.akka.api;
 
 import se.scalablesolutions.akka.annotation.*;
-import se.scalablesolutions.akka.kernel.configuration.*;
-import se.scalablesolutions.akka.kernel.InMemoryState;
+import se.scalablesolutions.akka.kernel.*;
+import se.scalablesolutions.akka.kernel.configuration.LifeCycle;
+import se.scalablesolutions.akka.kernel.configuration.Permanent;
+import se.scalablesolutions.akka.kernel.configuration.Component;
+import se.scalablesolutions.akka.kernel.configuration.AllForOne;
+import se.scalablesolutions.akka.kernel.configuration.RestartStrategy;
 
 import com.google.inject.Inject;
 import com.google.inject.AbstractModule;
@@ -101,7 +105,7 @@ interface InMemStateful {
 
 class InMemStatefulImpl implements InMemStateful {
   @state
-  private InMemoryState<String, Object> state = new InMemoryState<String, Object>();
+  private TransactionalMap<String, Object> state = new InMemoryTransactionalMap<String, Object>();
 
   public String getState(String key) {
     return (String) state.get(key);
@@ -152,7 +156,7 @@ interface InMemClasher {
 
 class InMemClasherImpl implements InMemClasher {
   @state
-  private InMemoryState<String, Object> state = new InMemoryState<String, Object>();
+  private TransactionalMap<String, Object> state = new InMemoryTransactionalMap<String, Object>();
 
   public String getState(String key) {
     return (String) state.get(key);
diff --git a/api-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java b/api-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java
index 336d8cc939..f92dd4186c 100755
--- a/api-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java
+++ b/api-java/src/test/java/se/scalablesolutions/akka/api/PersistentStateTest.java
@@ -5,8 +5,12 @@
 package se.scalablesolutions.akka.api;
 
 import se.scalablesolutions.akka.annotation.*;
-import se.scalablesolutions.akka.kernel.configuration.*;
-import se.scalablesolutions.akka.kernel.InMemoryState;
+import se.scalablesolutions.akka.kernel.*;
+import se.scalablesolutions.akka.kernel.configuration.LifeCycle;
+import se.scalablesolutions.akka.kernel.configuration.Permanent;
+import se.scalablesolutions.akka.kernel.configuration.Component;
+import se.scalablesolutions.akka.kernel.configuration.AllForOne;
+import se.scalablesolutions.akka.kernel.configuration.RestartStrategy;
 
 import com.google.inject.Inject;
 import com.google.inject.AbstractModule;
@@ -18,7 +22,7 @@ public class PersistentStateTest extends TestCase {
   static String messageLog = "";
 
   final private ActiveObjectGuiceConfigurator conf = new ActiveObjectGuiceConfigurator();
-
+  
   protected void setUp() {
     conf.configureActiveObjects(
         new RestartStrategy(new AllForOne(), 3, 5000),
@@ -59,8 +63,7 @@ interface PersistentStateful {
 }
 
 class PersistentStatefulImpl implements PersistentStateful {
-  @state
-  private InMemoryState<String, Object> state = new InMemoryState<String, Object>();
+  private TransactionalMap state = new CassandraPersistentTransactionalMap(this);
 
   public String getState(String key) {
     return (String) state.get(key);
@@ -110,8 +113,7 @@ interface PersistentClasher {
 }
 
 class PersistentClasherImpl implements PersistentClasher {
-  @state
-  private InMemoryState<String, Object> state = new InMemoryState<String, Object>();
+  private TransactionalMap state = new CassandraPersistentTransactionalMap(this);
 
   public String getState(String key) {
     return (String) state.get(key);
diff --git a/config/log4j.properties b/config/log4j.properties
index a737e5d745..c03de259b2 100755
--- a/config/log4j.properties
+++ b/config/log4j.properties
@@ -2,7 +2,7 @@
 # and the pattern to %c instead of %l.  (%l is slower.)
 
 # output messages into a rolling log file as well as stdout
-log4j.rootLogger=ERROR,stdout,R
+log4j.rootLogger=DEBUG,stdout,R
 
 # stdout
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
diff --git a/kernel/.classpath b/kernel/.classpath
index 4d757200a6..0eaeedbf53 100644
--- a/kernel/.classpath
+++ b/kernel/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main/scala"/>
 	<classpathentry kind="src" path="src/test/scala"/>
+	<classpathentry kind="src" path="src/main/scala"/>
 	<classpathentry kind="con" path="ch.epfl.lamp.sdt.launching.SCALA_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="/Users/jboner/src/scala/akka/lib/activation-1.1.jar"/>
diff --git a/kernel/src/main/scala/GenericServer.scala b/kernel/src/main/scala/GenericServer.scala
index be754d2074..f6ab680aa3 100644
--- a/kernel/src/main/scala/GenericServer.scala
+++ b/kernel/src/main/scala/GenericServer.scala
@@ -103,7 +103,7 @@ class GenericServerContainer(
   }
   
   // TX Maps
-  private[this] var _transactionalMaps: List[TransactionalMap[_, _]] = Nil
+  private[kernel] var _transactionalMaps: List[TransactionalMap[_, _]] = Nil
   private[kernel] def transactionalMaps_=(maps: List[TransactionalMap[_, _]]) = txItemsLock.withWriteLock {
     _transactionalMaps = maps
   }
@@ -112,7 +112,7 @@ class GenericServerContainer(
   }
 
   // TX Vectors
-  private[this] var _transactionalVectors: List[TransactionalVector[_]] = Nil
+  private[kernel] var _transactionalVectors: List[TransactionalVector[_]] = Nil
   private[kernel] def transactionalVectors_=(vectors: List[TransactionalVector[_]]) = txItemsLock.withWriteLock {
     _transactionalVectors = vectors
   }
@@ -121,7 +121,7 @@ class GenericServerContainer(
   }
 
   // TX Refs
-  private[this] var _transactionalRefs: List[TransactionalRef[_]] = Nil
+  private[kernel] var _transactionalRefs: List[TransactionalRef[_]] = Nil
   private[kernel] def transactionalRefs_=(refs: List[TransactionalRef[_]]) = txItemsLock.withWriteLock {
     _transactionalRefs = refs
   }
diff --git a/kernel/src/main/scala/State.scala b/kernel/src/main/scala/State.scala
index e0d3cb890d..415ce67f25 100755
--- a/kernel/src/main/scala/State.scala
+++ b/kernel/src/main/scala/State.scala
@@ -83,7 +83,8 @@ class InMemoryTransactionalMap[K, V] extends TransactionalMap[K, V] {
  * 
  * @author <a href="http://jonasboner.com">Jonas Bon&#233;r</a>
  */
-class CassandraPersistentTransactionalMap(val actorName: String) extends PersistentTransactionalMap[String, String] {
+class CassandraPersistentTransactionalMap(actorNameInstance: AnyRef) extends PersistentTransactionalMap[String, String] {
+  val actorName = actorNameInstance.getClass.getName
   override def begin = {}
   override def rollback = {}