Adding support for CLI Subcommands.