Update subcommand and options logic