Improve property data replication