Adding wrapper around CGI services.