Sync with table api changes.