Sync with chi changes