Subcommand handling improvements