API-related changes