Added multiple node types