Make the WebServer component more robust and flexible