Removed method checks for CGI