diff --git a/drools-reliability/drools-reliability-core/src/main/java/org/drools/reliability/core/ReliableNamedEntryPoint.java b/drools-reliability/drools-reliability-core/src/main/java/org/drools/reliability/core/ReliableNamedEntryPoint.java
index d747a504051..9f9ae720ea6 100644
--- a/drools-reliability/drools-reliability-core/src/main/java/org/drools/reliability/core/ReliableNamedEntryPoint.java
+++ b/drools-reliability/drools-reliability-core/src/main/java/org/drools/reliability/core/ReliableNamedEntryPoint.java
@@ -33,7 +33,8 @@ public ReliableNamedEntryPoint(EntryPointId entryPoint, EntryPointNode entryPoin
     protected ObjectStore createObjectStore(EntryPointId entryPoint, RuleBaseConfiguration conf, ReteEvaluator reteEvaluator) {
         boolean storesOnlyStrategy = reteEvaluator.getSessionConfiguration().getPersistedSessionOption().getPersistenceStrategy() == PersistedSessionOption.PersistenceStrategy.STORES_ONLY;
         return storesOnlyStrategy ?
-                SimpleReliableObjectStoreFactory.get().createSimpleReliableObjectStore(StorageManagerFactory.get().getStorageManager().getOrCreateStorageForSession(reteEvaluator, "ep" + getEntryPointId())) :
+                SimpleReliableObjectStoreFactory.get().createSimpleReliableObjectStore(StorageManagerFactory.get().getStorageManager().getOrCreateStorageForSession(reteEvaluator, "ep" + getEntryPointId()),
+                        reteEvaluator.getSessionConfiguration().getPersistedSessionOption()) :
                 new FullReliableObjectStore(StorageManagerFactory.get().getStorageManager().getOrCreateStorageForSession(reteEvaluator, "ep" + getEntryPointId()));
     }
 
diff --git a/drools-reliability/drools-reliability-core/src/main/java/org/drools/reliability/core/SerializableStoredObject.java b/drools-reliability/drools-reliability-core/src/main/java/org/drools/reliability/core/SerializableStoredObject.java
index 9495d5720a3..57a6c3c2702 100644
--- a/drools-reliability/drools-reliability-core/src/main/java/org/drools/reliability/core/SerializableStoredObject.java
+++ b/drools-reliability/drools-reliability-core/src/main/java/org/drools/reliability/core/SerializableStoredObject.java
@@ -19,7 +19,7 @@
 
 public class SerializableStoredObject extends BaseStoredObject {
 
-    private final Serializable object;
+    protected final Serializable object;
 
     public SerializableStoredObject(Object object, boolean propagated) {
         super(propagated);
diff --git a/drools-reliability/drools-reliability-core/src/main/java/org/drools/reliability/core/SerializableStoredRefObject.java b/drools-reliability/drools-reliability-core/src/main/java/org/drools/reliability/core/SerializableStoredRefObject.java
new file mode 100644
index 00000000000..1313cd25be4
--- /dev/null
+++ b/drools-reliability/drools-reliability-core/src/main/java/org/drools/reliability/core/SerializableStoredRefObject.java
@@ -0,0 +1,39 @@
+package org.drools.reliability.core;
+
+import org.drools.core.common.Storage;
+
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+public class SerializableStoredRefObject extends  SerializableStoredObject {
+
+    private final Map<String, Long> referencedObjects;
+
+    public SerializableStoredRefObject(Object object, boolean propagated) {
+        super(object, propagated);
+        referencedObjects=new HashMap<>();
+    }
+
+    public void addReferencedObject(String fieldName, Long refObjectKey){
+        this.referencedObjects.put(fieldName, refObjectKey);
+    }
+
+    public StoredObject updateReferencedObjects(Storage<Long, StoredObject> storage){
+        this.referencedObjects.keySet().forEach(fieldName -> {
+            Optional<Field> refField = Arrays.stream(object.getClass().getDeclaredFields())
+                    .filter(f -> f.getName().equals(fieldName)).findFirst();
+            if (refField.isPresent()){
+                refField.get().setAccessible(true);
+                try {
+                    refField.get().set(this.object, storage.get(this.referencedObjects.get(refField.get().getName())).getObject());
+                } catch (IllegalAccessException e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+        return this;
+    }
+}
diff --git a/drools-reliability/drools-reliability-core/src/main/java/org/drools/reliability/core/SimpleReliableObjectStoreFactory.java b/drools-reliability/drools-reliability-core/src/main/java/org/drools/reliability/core/SimpleReliableObjectStoreFactory.java
index 3f195361382..188f90610c9 100644
--- a/drools-reliability/drools-reliability-core/src/main/java/org/drools/reliability/core/SimpleReliableObjectStoreFactory.java
+++ b/drools-reliability/drools-reliability-core/src/main/java/org/drools/reliability/core/SimpleReliableObjectStoreFactory.java
@@ -17,10 +17,11 @@
 
 import org.drools.core.common.Storage;
 import org.kie.api.internal.utils.KieService;
+import org.kie.api.runtime.conf.PersistedSessionOption;
 
 public interface SimpleReliableObjectStoreFactory extends KieService {
 
-    SimpleReliableObjectStore createSimpleReliableObjectStore(Storage<Long, StoredObject> storage);
+    SimpleReliableObjectStore createSimpleReliableObjectStore(Storage<Long, StoredObject> storage, PersistedSessionOption persistedSessionOption);
 
     class Holder {
 
diff --git a/drools-reliability/drools-reliability-core/src/main/java/org/drools/reliability/core/SimpleSerializationReliableObjectStore.java b/drools-reliability/drools-reliability-core/src/main/java/org/drools/reliability/core/SimpleSerializationReliableObjectStore.java
index 24acb1c5e6d..be5b99c5555 100644
--- a/drools-reliability/drools-reliability-core/src/main/java/org/drools/reliability/core/SimpleSerializationReliableObjectStore.java
+++ b/drools-reliability/drools-reliability-core/src/main/java/org/drools/reliability/core/SimpleSerializationReliableObjectStore.java
@@ -15,10 +15,6 @@
 
 package org.drools.reliability.core;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
 import org.drools.core.ClockType;
 import org.drools.core.common.DefaultEventHandle;
 import org.drools.core.common.IdentityObjectStore;
@@ -27,9 +23,13 @@
 import org.drools.core.common.InternalWorkingMemoryEntryPoint;
 import org.drools.core.common.Storage;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
 public class SimpleSerializationReliableObjectStore extends IdentityObjectStore implements SimpleReliableObjectStore {
 
-    protected final transient Storage<Long, StoredObject> storage;
+    protected transient Storage<Long, StoredObject> storage;
 
     protected boolean reInitPropagated = false;
 
@@ -113,7 +113,7 @@ public void putIntoPersistedStorage(InternalFactHandle handle, boolean propagate
         storage.put(getHandleForObject(object).getId(), storedObject);
     }
 
-    private StoredObject factHandleToStoredObject(InternalFactHandle handle, boolean propagated, Object object) {
+    StoredObject factHandleToStoredObject(InternalFactHandle handle, boolean propagated, Object object) {
         return handle.isEvent() ?
                 createStoredEvent(propagated, object, ((DefaultEventHandle) handle).getStartTimestamp(), ((DefaultEventHandle) handle).getDuration()) :
                 createStoredObject(propagated, object);
diff --git a/drools-reliability/drools-reliability-core/src/main/java/org/drools/reliability/core/SimpleSerializationReliableObjectStoreFactory.java b/drools-reliability/drools-reliability-core/src/main/java/org/drools/reliability/core/SimpleSerializationReliableObjectStoreFactory.java
index 81478de918b..aad37b71998 100644
--- a/drools-reliability/drools-reliability-core/src/main/java/org/drools/reliability/core/SimpleSerializationReliableObjectStoreFactory.java
+++ b/drools-reliability/drools-reliability-core/src/main/java/org/drools/reliability/core/SimpleSerializationReliableObjectStoreFactory.java
@@ -16,6 +16,7 @@
 package org.drools.reliability.core;
 
 import org.drools.core.common.Storage;
+import org.kie.api.runtime.conf.PersistedSessionOption;
 
 public class SimpleSerializationReliableObjectStoreFactory implements SimpleReliableObjectStoreFactory {
 
@@ -25,6 +26,14 @@ public SimpleReliableObjectStore createSimpleReliableObjectStore(Storage<Long, S
         return new SimpleSerializationReliableObjectStore(storage);
     }
 
+    public SimpleReliableObjectStore createSimpleReliableObjectStore(Storage<Long, StoredObject> storage, PersistedSessionOption persistedSessionOption) {
+        if (persistedSessionOption.getPersistenceObjectsStrategy() == PersistedSessionOption.PersistenceObjectsStrategy.SIMPLE) {
+            return new SimpleSerializationReliableObjectStore(storage);
+        }else {
+            return new SimpleSerializationReliableRefObjectStore(storage);
+        }
+    }
+
     @Override
     public int servicePriority() {
         return servicePriorityValue;
diff --git a/drools-reliability/drools-reliability-core/src/main/java/org/drools/reliability/core/SimpleSerializationReliableRefObjectStore.java b/drools-reliability/drools-reliability-core/src/main/java/org/drools/reliability/core/SimpleSerializationReliableRefObjectStore.java
new file mode 100644
index 00000000000..71279ad7420
--- /dev/null
+++ b/drools-reliability/drools-reliability-core/src/main/java/org/drools/reliability/core/SimpleSerializationReliableRefObjectStore.java
@@ -0,0 +1,86 @@
+package org.drools.reliability.core;
+
+import org.drools.core.common.InternalFactHandle;
+import org.drools.core.common.Storage;
+
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class SimpleSerializationReliableRefObjectStore extends SimpleSerializationReliableObjectStore {
+
+    public SimpleSerializationReliableRefObjectStore(Storage<Long, StoredObject> storage) {
+        super(storage);
+        this.storage = storage.size()>0 ? updateObjectReferences(storage) : storage;
+    }
+
+    private Storage<Long, StoredObject> updateObjectReferences(Storage<Long, StoredObject> storage){
+        Storage<Long, StoredObject> updateStorage = storage;
+
+        for (Long key: storage.keySet()){
+            updateStorage.put(key, ((SerializableStoredRefObject) storage.get(key)).updateReferencedObjects(storage));
+        }
+        return updateStorage;
+    }
+
+    @Override
+    public void putIntoPersistedStorage(InternalFactHandle handle, boolean propagated) {
+        Object object = handle.getObject();
+        StoredObject storedObject = factHandleToStoredObject(handle, reInitPropagated || propagated, object);
+        storage.put(getHandleForObject(object).getId(), setReferencedObjects(storedObject));
+    }
+
+    @Override
+    protected StoredObject createStoredObject(boolean propagated, Object object) {
+        return new SerializableStoredRefObject(object, propagated);
+    }
+
+    private void updateReferencedObjects(StoredObject object){
+        List<Field> referencedObjects = getReferencedObjects(object.getObject());
+        if (referencedObjects.size()>0) {
+
+        }
+    }
+
+    private StoredObject setReferencedObjects(StoredObject object){
+        List<Field> referencedObjects = getReferencedObjects(object.getObject());
+        if (referencedObjects.size()>0) {
+            // for each referenced object in sObject
+            //  lookup in storage, find the object of reference, get its fact handle id
+            //      save this association in the StoredObject
+            referencedObjects.forEach(field -> {
+                field.setAccessible(true);
+                Object fieldObject = null;
+                try {
+                    fieldObject = field.get(object.getObject());
+                } catch (IllegalAccessException e) {
+                    e.printStackTrace();
+                }
+                Long objectKey = fromObjectToFactHandleId(fieldObject);
+                if (objectKey!=null){
+                    ((SerializableStoredRefObject) object).addReferencedObject(field.getName(), objectKey);}
+            });
+        }
+        return object;
+    }
+
+    private Long fromObjectToFactHandleId(Object object){
+        for (Long key : this.storage.keySet()){
+            if (( (SerializableStoredRefObject) storage.get(key)).getObject()==object){
+                return key;
+            }
+        }
+        return null;
+    }
+
+    private List<Field> getReferencedObjects(Object object){
+        Field[] fields = object.getClass().getDeclaredFields();
+
+        List<Field> nonPrimitiveFields = Arrays.stream(fields)
+                .filter(field -> !field.getType().isPrimitive())
+                .filter(field -> !field.getType().equals(String.class))
+                .collect(Collectors.toList());
+        return nonPrimitiveFields;
+    }
+}
diff --git a/drools-reliability/drools-reliability-infinispan/src/main/java/org/drools/reliability/infinispan/SimpleInfinispanReliableObjectStoreFactory.java b/drools-reliability/drools-reliability-infinispan/src/main/java/org/drools/reliability/infinispan/SimpleInfinispanReliableObjectStoreFactory.java
index 5a28d66e6db..49ae4f3be96 100644
--- a/drools-reliability/drools-reliability-infinispan/src/main/java/org/drools/reliability/infinispan/SimpleInfinispanReliableObjectStoreFactory.java
+++ b/drools-reliability/drools-reliability-infinispan/src/main/java/org/drools/reliability/infinispan/SimpleInfinispanReliableObjectStoreFactory.java
@@ -19,9 +19,11 @@
 import org.drools.reliability.core.SimpleReliableObjectStore;
 import org.drools.reliability.core.SimpleReliableObjectStoreFactory;
 import org.drools.reliability.core.SimpleSerializationReliableObjectStore;
+import org.drools.reliability.core.SimpleSerializationReliableRefObjectStore;
 import org.drools.reliability.core.StorageManagerFactory;
 import org.drools.reliability.core.StoredObject;
 import org.drools.reliability.infinispan.proto.SimpleProtoStreamReliableObjectStore;
+import org.kie.api.runtime.conf.PersistedSessionOption;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,13 +33,18 @@ public class SimpleInfinispanReliableObjectStoreFactory implements SimpleReliabl
 
     private static final Logger LOG = LoggerFactory.getLogger(SimpleInfinispanReliableObjectStoreFactory.class);
 
-    public SimpleReliableObjectStore createSimpleReliableObjectStore(Storage<Long, StoredObject> storage) {
+    public SimpleReliableObjectStore createSimpleReliableObjectStore(Storage<Long, StoredObject> storage, PersistedSessionOption persistedSessionOption) {
         if (((InfinispanStorageManager)StorageManagerFactory.get().getStorageManager()).isProtoStream()) {
             LOG.debug("Using SimpleProtoStreamReliableObjectStore");
             return new SimpleProtoStreamReliableObjectStore(storage);
         } else {
-            LOG.debug("Using SimpleSerializationReliableObjectStore");
-            return new SimpleSerializationReliableObjectStore(storage);
+            if (persistedSessionOption.getPersistenceObjectsStrategy()== PersistedSessionOption.PersistenceObjectsStrategy.OBJECT_REFERENCES){
+                LOG.debug("Using SimpleSerializationReliableRefObjectStore");
+                return new SimpleSerializationReliableRefObjectStore(storage);
+            }else{
+                LOG.debug("Using SimpleSerializationReliableObjectStore");
+                return new SimpleSerializationReliableObjectStore(storage);
+            }
         }
     }
 
@@ -45,4 +52,5 @@ public SimpleReliableObjectStore createSimpleReliableObjectStore(Storage<Long, S
     public int servicePriority() {
         return servicePriorityValue;
     }
+
 }
diff --git a/drools-reliability/drools-reliability-tests/src/test/java/org/drools/reliability/test/ReliabilityFireAndAlarmTest.java b/drools-reliability/drools-reliability-tests/src/test/java/org/drools/reliability/test/ReliabilityFireAndAlarmTest.java
new file mode 100644
index 00000000000..83ea3bd6b6e
--- /dev/null
+++ b/drools-reliability/drools-reliability-tests/src/test/java/org/drools/reliability/test/ReliabilityFireAndAlarmTest.java
@@ -0,0 +1,87 @@
+package org.drools.reliability.test;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.kie.api.runtime.conf.PersistedSessionOption;
+import org.kie.api.runtime.rule.FactHandle;
+import org.test.domain.fireandalarm.Alarm;
+import org.test.domain.fireandalarm.Fire;
+import org.test.domain.fireandalarm.Room;
+import org.test.domain.fireandalarm.Sprinkler;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class ReliabilityFireAndAlarmTest extends ReliabilityTestBasics{
+    private static final String FIRE_AND_ALARM =
+            "import " + Alarm.class.getCanonicalName() + ";" +
+                    "import " + Fire.class.getCanonicalName() + ";" +
+                    "import " + Sprinkler.class.getCanonicalName() + ";" +
+                    "import " + Room.class.getCanonicalName() + ";" +
+                    "global java.util.List results;" +
+                    "rule 'When there is a fire turn on the sprinkler' when\n" +
+                    "  Fire($room : room) \n" +
+                    "  $sprinkler: Sprinkler( room == $room, on == false ) \n" +
+                    "then\n" +
+                    "  modify($sprinkler) { setOn(true); } \n" +
+                    "  System.out.println(\"Turn on the sprinkler for room\" + $room.getName()); \n" +
+                    "end\n" +
+                    "rule 'Raise the alarm when we have one or more firs' when\n" +
+                    "  exists Fire() \n" +
+                    "then\n" +
+                    "  insert( new Alarm() );\n" +
+                    "  System.out.println(\"Raise the alarm\");\n" +
+                    "end\n"+
+                    "rule 'Cancel the alarm when all the fires have gone' when \n" +
+                    "   not Fire() \n" +
+                    "   $alarm : Alarm() \n" +
+                    "then\n" +
+                    "   delete ( $alarm ); \n" +
+                    "   System.out.println(\"Cancel the alarm\"); \n" +
+                    "end\n" +
+                    "rule 'Status output when things are ok' when\n" +
+                    "   not Alarm() \n" +
+                    "   not Sprinkler ( on == true ) \n" +
+                    "then \n" +
+                    "   System.out.println(\"Everything is ok\"); \n" +
+                    "end";
+
+
+    @ParameterizedTest
+    @MethodSource("strategyProviderStoresOnlyWithExplicitSafepoints")
+    void testNoFailover(PersistedSessionOption.PersistenceStrategy persistenceStrategy, PersistedSessionOption.SafepointStrategy safepointStrategy){
+        createSession(FIRE_AND_ALARM, persistenceStrategy, safepointStrategy);
+
+        // phase 1
+        Room room1 = new Room("Room 1");
+        insert(room1);
+        FactHandle fireFact1 = insert(new Fire(room1));
+        fireAllRules();
+
+        // phase 2
+        Sprinkler sprinkler1 = new Sprinkler(room1);
+        insert(sprinkler1);
+        fireAllRules();
+
+        assertThat(sprinkler1.isOn()).isTrue();
+
+        // phase 3
+        delete(fireFact1);
+        fireAllRules();
+    }
+
+    @ParameterizedTest
+    @MethodSource("strategyProviderStoresOnlyWithExplicitSafepoints")
+    void testInsertFailover_ShouldFireRules(PersistedSessionOption.PersistenceStrategy persistenceStrategy, PersistedSessionOption.SafepointStrategy safepointStrategy){
+        createSession(FIRE_AND_ALARM, persistenceStrategy, safepointStrategy, PersistedSessionOption.PersistenceObjectsStrategy.OBJECT_REFERENCES);
+
+        Room room1 = new Room("Room 1");
+        insert(room1);
+        insert(new Fire(room1));
+        insert(new Sprinkler(room1));
+
+        failover();
+        restoreSession(FIRE_AND_ALARM, persistenceStrategy,safepointStrategy,PersistedSessionOption.PersistenceObjectsStrategy.OBJECT_REFERENCES);
+
+        assertThat(fireAllRules()).isEqualTo(2);
+    }
+}
diff --git a/drools-reliability/drools-reliability-tests/src/test/java/org/drools/reliability/test/ReliabilityTestBasics.java b/drools-reliability/drools-reliability-tests/src/test/java/org/drools/reliability/test/ReliabilityTestBasics.java
index 687b1db80fa..37d3e5fe120 100644
--- a/drools-reliability/drools-reliability-tests/src/test/java/org/drools/reliability/test/ReliabilityTestBasics.java
+++ b/drools-reliability/drools-reliability-tests/src/test/java/org/drools/reliability/test/ReliabilityTestBasics.java
@@ -15,14 +15,6 @@
 
 package org.drools.reliability.test;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Optional;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Stream;
-
 import org.drools.base.facttemplates.Event;
 import org.drools.core.ClassObjectFilter;
 import org.drools.kiesession.session.StatefulKnowledgeSessionImpl;
@@ -57,10 +49,18 @@
 import org.slf4j.LoggerFactory;
 import org.test.domain.Person;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Stream;
+
 import static org.drools.reliability.infinispan.InfinispanStorageManagerFactory.INFINISPAN_STORAGE_MARSHALLER;
 import static org.drools.reliability.infinispan.InfinispanStorageManagerFactory.INFINISPAN_STORAGE_MODE;
-import static org.drools.reliability.test.util.TestConfigurationUtils.DROOLS_RELIABILITY_MODULE_TEST;
 import static org.drools.reliability.test.util.PrototypeUtils.createEvent;
+import static org.drools.reliability.test.util.TestConfigurationUtils.DROOLS_RELIABILITY_MODULE_TEST;
 import static org.drools.util.Config.getConfig;
 import static org.junit.jupiter.params.provider.Arguments.arguments;
 
@@ -256,6 +256,12 @@ protected KieSession createSession(String drl, PersistedSessionOption.Persistenc
         return getKieSession(drl, persistenceStrategy != null ? PersistedSessionOption.newSession().withPersistenceStrategy(persistenceStrategy).withSafepointStrategy(safepointStrategy) : null, options);
     }
 
+    protected KieSession createSession(String drl, PersistedSessionOption.PersistenceStrategy persistenceStrategy, PersistedSessionOption.SafepointStrategy safepointStrategy,
+                                       PersistedSessionOption.PersistenceObjectsStrategy persistenceObjectsStrategy, Option... options) {
+        return getKieSession(drl, persistenceStrategy != null ? PersistedSessionOption.newSession().withPersistenceStrategy(persistenceStrategy)
+                .withSafepointStrategy(safepointStrategy).withPersistenceObjectsStrategy(persistenceObjectsStrategy) : null, options);
+    }
+
     protected KieSession createSession(String drl, PersistedSessionOption.PersistenceStrategy persistenceStrategy, PersistedSessionOption.SafepointStrategy safepointStrategy, boolean useKieBaseCache, Option... options) {
         return getKieSession(drl, persistenceStrategy != null ? PersistedSessionOption.newSession().withPersistenceStrategy(persistenceStrategy).withSafepointStrategy(safepointStrategy) : null, useKieBaseCache, options);
     }
@@ -273,11 +279,24 @@ protected KieSession restoreSession(String drl, PersistedSessionOption.Persisten
         return restoreSession(sessionIdToRestoreFrom, drl, persistenceStrategy, safepointStrategy, options);
     }
 
+    protected KieSession restoreSession(String drl, PersistedSessionOption.PersistenceStrategy persistenceStrategy, PersistedSessionOption.SafepointStrategy safepointStrategy,
+                                        PersistedSessionOption.PersistenceObjectsStrategy persistenceObjectsStrategy, Option... options) {
+        Long sessionIdToRestoreFrom = (Long)this.persistedSessionIds.values().toArray()[0];
+        return restoreSession(sessionIdToRestoreFrom, drl, persistenceStrategy, safepointStrategy, persistenceObjectsStrategy, options);
+    }
+
     protected KieSession restoreSession(Long sessionId, String drl, PersistedSessionOption.PersistenceStrategy persistenceStrategy, PersistedSessionOption.SafepointStrategy safepointStrategy, Option... options) {
         Long sessionIdToRestoreFrom = this.persistedSessionIds.get(sessionId);
         return getKieSession(drl, PersistedSessionOption.fromSession(sessionIdToRestoreFrom).withPersistenceStrategy(persistenceStrategy).withSafepointStrategy(safepointStrategy), options);
     }
 
+    protected KieSession restoreSession(Long sessionId, String drl, PersistedSessionOption.PersistenceStrategy persistenceStrategy, PersistedSessionOption.SafepointStrategy safepointStrategy,
+                                        PersistedSessionOption.PersistenceObjectsStrategy persistenceObjectsStrategy, Option... options) {
+        Long sessionIdToRestoreFrom = this.persistedSessionIds.get(sessionId);
+        return getKieSession(drl, PersistedSessionOption.fromSession(sessionIdToRestoreFrom).withPersistenceStrategy(persistenceStrategy)
+                .withSafepointStrategy(safepointStrategy).withPersistenceObjectsStrategy(persistenceObjectsStrategy), options);
+    }
+
     protected KieSession restoreSession(Long sessionId, String drl, PersistedSessionOption.PersistenceStrategy persistenceStrategy, PersistedSessionOption.SafepointStrategy safepointStrategy, boolean useKieBaseCache, Option... options) {
         Long sessionIdToRestoreFrom = this.persistedSessionIds.get(sessionId);
         return getKieSession(drl, PersistedSessionOption.fromSession(sessionIdToRestoreFrom).withPersistenceStrategy(persistenceStrategy).withSafepointStrategy(safepointStrategy), useKieBaseCache, options);
diff --git a/drools-reliability/drools-reliability-tests/src/test/java/org/test/domain/fireandalarm/Alarm.java b/drools-reliability/drools-reliability-tests/src/test/java/org/test/domain/fireandalarm/Alarm.java
new file mode 100644
index 00000000000..e25215b97dc
--- /dev/null
+++ b/drools-reliability/drools-reliability-tests/src/test/java/org/test/domain/fireandalarm/Alarm.java
@@ -0,0 +1,6 @@
+package org.test.domain.fireandalarm;
+
+import java.io.Serializable;
+
+public class Alarm implements Serializable {
+}
diff --git a/drools-reliability/drools-reliability-tests/src/test/java/org/test/domain/fireandalarm/Fire.java b/drools-reliability/drools-reliability-tests/src/test/java/org/test/domain/fireandalarm/Fire.java
new file mode 100644
index 00000000000..5e10af965e2
--- /dev/null
+++ b/drools-reliability/drools-reliability-tests/src/test/java/org/test/domain/fireandalarm/Fire.java
@@ -0,0 +1,21 @@
+package org.test.domain.fireandalarm;
+
+import java.io.Serializable;
+
+public class Fire implements Serializable {
+    private Room room;
+
+    public Fire() { }
+
+    public Fire(Room room) {
+        this.room = room;
+    }
+
+    public Room getRoom() {
+        return room;
+    }
+
+    public void setRoom(Room room) {
+        this.room = room;
+    }
+}
diff --git a/drools-reliability/drools-reliability-tests/src/test/java/org/test/domain/fireandalarm/Room.java b/drools-reliability/drools-reliability-tests/src/test/java/org/test/domain/fireandalarm/Room.java
new file mode 100644
index 00000000000..eda547988f5
--- /dev/null
+++ b/drools-reliability/drools-reliability-tests/src/test/java/org/test/domain/fireandalarm/Room.java
@@ -0,0 +1,27 @@
+package org.test.domain.fireandalarm;
+
+import java.io.Serializable;
+
+public class Room implements Serializable {
+
+    private String name;
+
+    public Room() { }
+
+    public Room(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
+}
diff --git a/drools-reliability/drools-reliability-tests/src/test/java/org/test/domain/fireandalarm/Sprinkler.java b/drools-reliability/drools-reliability-tests/src/test/java/org/test/domain/fireandalarm/Sprinkler.java
new file mode 100644
index 00000000000..610d7fd1882
--- /dev/null
+++ b/drools-reliability/drools-reliability-tests/src/test/java/org/test/domain/fireandalarm/Sprinkler.java
@@ -0,0 +1,35 @@
+package org.test.domain.fireandalarm;
+
+import java.io.Serializable;
+
+public class Sprinkler implements Serializable {
+    private Room room;
+    private boolean on = false;
+
+    public Sprinkler() { }
+
+    public Sprinkler(Room room) {
+        this.room = room;
+    }
+
+    public Room getRoom() {
+        return room;
+    }
+
+    public void setRoom(Room room) {
+        this.room = room;
+    }
+
+    public boolean isOn() {
+        return on;
+    }
+
+    public void setOn(boolean on) {
+        this.on = on;
+    }
+
+    @Override
+    public String toString() {
+        return "Sprinkler for " + room;
+    }
+}
diff --git a/kie-api/src/main/java/org/kie/api/runtime/conf/PersistedSessionOption.java b/kie-api/src/main/java/org/kie/api/runtime/conf/PersistedSessionOption.java
index aa6fa2082ee..e0bef84f904 100644
--- a/kie-api/src/main/java/org/kie/api/runtime/conf/PersistedSessionOption.java
+++ b/kie-api/src/main/java/org/kie/api/runtime/conf/PersistedSessionOption.java
@@ -28,6 +28,10 @@ public enum PersistenceStrategy {
         FULL, STORES_ONLY
     }
 
+    public enum PersistenceObjectsStrategy {
+        SIMPLE, OBJECT_REFERENCES
+    }
+
     public enum SafepointStrategy {
         ALWAYS, AFTER_FIRE, EXPLICIT;
 
@@ -45,6 +49,8 @@ public boolean useSafepoints() {
 
     private PersistenceStrategy persistenceStrategy = PersistenceStrategy.FULL;
 
+    private PersistenceObjectsStrategy persistenceObjectsStrategy = PersistenceObjectsStrategy.SIMPLE;
+
     private SafepointStrategy safepointStrategy = SafepointStrategy.ALWAYS;
 
     private PersistedSessionOption() {
@@ -78,6 +84,13 @@ public PersistenceStrategy getPersistenceStrategy() {
         return persistenceStrategy;
     }
 
+    public PersistenceObjectsStrategy getPersistenceObjectsStrategy() {return persistenceObjectsStrategy;}
+
+    public PersistedSessionOption withPersistenceObjectsStrategy(PersistenceObjectsStrategy persistenceObjectsStrategy){
+        this.persistenceObjectsStrategy = persistenceObjectsStrategy;
+        return this;
+    }
+
     public PersistedSessionOption withPersistenceStrategy(PersistenceStrategy persistenceStrategy) {
         this.persistenceStrategy = persistenceStrategy;
         return this;