Add back cgi and cgis