Fixed to match new API calls