Make changes to sync manager to allow sync tracking