More alignment with API spec