Resync with latest changes