changes related to data sync feature