Resync with current changes