Fix for req #308 & #307

The changes are to save only the required attributes from other nodes instead of saving the complete node object. Refer req #308 . This also fixes req #307 .
Any reason to remove the following fixes for issue #236?