Add with-subcommand function