Improve HttpServer