More work with data node system