Rework subcommand declaration;