Add simple subcommand support