Refining the API