MOre work on data layer migration