Feature/client persistence