Refine the API