Small detail, but I would move this after we register the v2 endpoint below.

Other than that, +1.