Transitioning to new API.