Added support for cli-command and virtualenv.