More work on data-layer - WIP