#9 added value nodes to core model and extend scanning