Making few more changes to sync logic