Adapted to new location of Node related classes.
Added extra info to parameter map.
Merge of master