Extract thor subcommand patch to own class