Component nodes

Merged Component Nodes branch into the main branch