More api-related changes