Data layer architecture changed, UoW is ahead