Updates to client/server to handle options