Data layer mostly updated