Removed persistentstorage class - requires a major refactor