Change baseUrl to prefix and added missing event-stream