Let's move this to the api namespace