Go back to using subparsers