Working on more efficent persistence