Added ability to pass user to client and server