Refactors server persistance