Modified API calls