Updates for API
filling in more of the API