More API adjustments