Added CGI capabilities