diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/lifecycle/SolrCoreLoadRegistration.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/lifecycle/SolrCoreLoadRegistration.java
index f7428d1d4..7c51579d5 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/lifecycle/SolrCoreLoadRegistration.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/lifecycle/SolrCoreLoadRegistration.java
@@ -102,9 +102,8 @@ public class SolrCoreLoadRegistration {
             }
 
             List<Tracker> trackers = createTrackers(coreName, trackerRegistry, props, scheduler, repositoryClient, srv);
-            List<Tracker> lockBeforeCommit = getLockBeforeCommit(trackers);
 
-            CommitTracker commitTracker = new CommitTracker(props, repositoryClient, coreName, srv, lockBeforeCommit);
+            CommitTracker commitTracker = new CommitTracker(props, repositoryClient, coreName, srv, trackers);
             trackerRegistry.register(coreName, commitTracker);
             scheduler.schedule(commitTracker, coreName, props);
             log.info("The Trackers are now scheduled to run");
@@ -165,18 +164,6 @@ public class SolrCoreLoadRegistration {
         return trackers;
     }
 
-    private static List<Tracker> getLockBeforeCommit(List<Tracker> trackers) {
-        List<Tracker> lockBeforeCommit = new ArrayList();
-        for(Tracker tracker : trackers) {
-            if(tracker instanceof MetadataTracker) {
-                lockBeforeCommit.add(tracker);
-            }else if(tracker instanceof AclTracker) {
-                lockBeforeCommit.add(tracker);
-            }
-        }
-        return lockBeforeCommit;
-    }
-
     /**
      * Shuts down the trackers for a core.
      *
diff --git a/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/CommitTracker.java b/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/CommitTracker.java
index 8d3f62e01..a01081a5f 100644
--- a/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/CommitTracker.java
+++ b/search-services/alfresco-search/src/main/java/org/alfresco/solr/tracker/CommitTracker.java
@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
 
 import org.alfresco.solr.InformationServer;
 import org.alfresco.solr.client.SOLRAPIClient;
@@ -35,11 +36,14 @@ import org.slf4j.LoggerFactory;
 
 public class CommitTracker extends AbstractTracker
 {
-    private List<Tracker> trackers;
     private long lastCommit;
     private long lastSearcherOpened;
     private long commitInterval;
     private long newSearcherInterval;
+    private MetadataTracker metadataTracker;
+    private AclTracker aclTracker;
+    private ContentTracker contentTracker;
+    private CascadeTracker cascadeTracker;
     private AtomicInteger rollbackCount = new AtomicInteger(0);
 
     protected final static Logger log = LoggerFactory.getLogger(CommitTracker.class);
@@ -59,7 +63,20 @@ public class CommitTracker extends AbstractTracker
                          List<Tracker> trackers)
     {
         super(p, client, coreName, informationServer);
-        this.trackers = trackers;
+
+        //Set the trackers
+        for(Tracker tracker : trackers) {
+            if(tracker instanceof MetadataTracker) {
+                this.metadataTracker = (MetadataTracker) tracker;
+            } else if(tracker instanceof AclTracker) {
+                this.aclTracker = (AclTracker)tracker;
+            } else if(tracker instanceof ContentTracker) {
+                this.contentTracker = (ContentTracker)tracker;
+            } else if(tracker instanceof CascadeTracker) {
+                this.cascadeTracker = (CascadeTracker)tracker;
+            }
+        }
+
         commitInterval = Long.parseLong(p.getProperty("alfresco.commitInterval", "60000")); // Default: commit once per minute
         newSearcherInterval = Integer.parseInt(p.getProperty("alfresco.newSearcherInterval", "120000")); // Default: Open searchers every two minutes
         lastSearcherOpened = lastCommit = System.currentTimeMillis();
@@ -67,15 +84,7 @@ public class CommitTracker extends AbstractTracker
 
     public boolean hasMaintenance()
     {
-        for(Tracker tracker : trackers)
-        {
-            if(tracker.hasMaintenance())
-            {
-                return true;
-            }
-        }
-
-        return false;
+        return (metadataTracker.hasMaintenance() || aclTracker.hasMaintenance());
     }
 
     public int getRollbackCount() {
@@ -84,10 +93,8 @@ public class CommitTracker extends AbstractTracker
 
     public void maintenance() throws Exception
     {
-        for(Tracker tracker : trackers)
-        {
-            tracker.maintenance();
-        }
+        metadataTracker.maintenance();
+        aclTracker.maintenance();
     }
 
     @Override
@@ -99,7 +106,6 @@ public class CommitTracker extends AbstractTracker
         boolean hasMaintenance = hasMaintenance();
         //System.out.println("############# Commit Tracker doTrack()");
 
-
         if((currentTime - lastCommit) > commitInterval || hasMaintenance)
         {
             commitNeeded = true;
@@ -119,18 +125,16 @@ public class CommitTracker extends AbstractTracker
 
         try
         {
-            for(Tracker tracker : trackers)
-            {
-                tracker.getWriteLock().acquire();
-            }
+            metadataTracker.getWriteLock().acquire();
+            assert(metadataTracker.getWriteLock().availablePermits() == 0);
 
-            //We've acquired all the tracker locks causing all indexing trackers to pause. Now we can do the work below in isolation.
+            aclTracker.getWriteLock().acquire();
+            assert(aclTracker.getWriteLock().availablePermits() == 0);
 
-            for(Tracker tracker : trackers) {
-                if(tracker.getRollback()) {
-                    doRollback();
-                    return;
-                }
+            //See if we need a rollback
+            if(metadataTracker.getRollback() || aclTracker.getRollback()) {
+                doRollback();
+                return;
             }
 
             if(hasMaintenance) {
@@ -150,13 +154,12 @@ public class CommitTracker extends AbstractTracker
         }
         finally
         {
-            for(Tracker tracker : trackers)
-            {
-                assert(tracker.getWriteLock().availablePermits() == 0);
-                tracker.getWriteLock().release();
-            }
-            //System.out.println("######## Commit Tracker Releasing Write Locks ########");
+            //Release the lock on the metadata Tracker
+            metadataTracker.getWriteLock().release();
 
+            //Release the lock on the aclTracker
+            aclTracker.getWriteLock().release();
+            //System.out.println("######## Commit Tracker Releasing Write Locks ########");
         }
     }
 
@@ -164,6 +167,13 @@ public class CommitTracker extends AbstractTracker
     {
         try
         {
+            //Acquire the locks for the content tracker and cascade tracker
+            contentTracker.getWriteLock().acquire();
+            assert(contentTracker.getWriteLock().availablePermits() == 0);
+
+            cascadeTracker.getWriteLock().acquire();
+            assert(cascadeTracker.getWriteLock().availablePermits() == 0);
+
             infoSrv.rollback();
         }
         catch (Exception e)
@@ -172,12 +182,26 @@ public class CommitTracker extends AbstractTracker
         }
         finally
         {
-            //We did the rollback. Even it fails we set rollback to false so we don't continue to rollback over and over again.
-            for(Tracker tracker : trackers)
-            {
-                tracker.setRollback(false);
-                tracker.invalidateState();
-            }
+            //Reset acl Tracker
+            aclTracker.setRollback(false);
+            aclTracker.invalidateState();
+
+            //Reset metadataTracker
+            metadataTracker.setRollback(false);
+            metadataTracker.invalidateState();
+
+            //Reset contentTracker
+            contentTracker.setRollback(false);
+            contentTracker.invalidateState();
+
+            //Reset cascadeTracker
+            cascadeTracker.setRollback(false);
+            cascadeTracker.invalidateState();
+
+            //Release the locks
+            contentTracker.getWriteLock().release();
+            cascadeTracker.getWriteLock().release();
+
             rollbackCount.incrementAndGet();
         }
     }