implemented new node types temporarilly