Improve serverside client