Finish the work on the api.