REN-132 Added more nodetypes