HTTP Server Class and other improvements