Added more to the API