Not tested change of the API