Few subcommand changes