Many fixes on Sync system and change it to v2