Use correct API calls