Some modifications on the API.