API refinements.