Update to client/server export