PersistenceManager update - better separation of swarm from  adaptors