[WIP] Rework DMS without `base_data`

I needed to see all the changes easily, so created this MR on my own repository. Will do an MR on upstream when ready.