Updated with API documentation