Fix server to be long running, export key names