cleaned up the changes for persistence api