Various changes in the API