Adding persistance module back