Added types to nodes