API class updated