Web Server improvements