Added more support for inbuild web server