Update for the last changes in the API