Enhanced on the api infrastructure