Updating code to work with DiffSync