Sync with new version of component