More API refinement.