Data consistency changes