Added polyfill and got rid of persistence completely