Converted to serve from Jetty