Sync with library changes