Update to changes of subcommand