Adapting to the new API.