Sync with new documentation