Add subcommand feature again