Added preliminary support for CGI