Moved to Jetty container