More work on the API.