Made the persistances work even if called as a Function.