More nodes, data types and functionality