Separated client and server client code