#10: Clean up of Attributes and add MetaData per node