Add support for subcommand