Added more of the API