Started adding support for subcommands