CMS-2634 Add attachmens to node when storing content

Some cleanup