Change Persitence to a module