Added some client/server magic