Rest API infrastructure improvements.