Further support for static/single DS (stable WIP)