Save only the requrired attributes from other nodes instead of the whole node object (issue #308). This also handles issue #307