Added NodeInfo, types