Added and separated subcommand parsing