API refinements