Sync with latest upstream API