Add data layer, update packages