Fixing with the new version of PersistentLayer.