More API minimization.