Upgrade the api ABC infrastructure heavily