Aligned with API specification