Added generic nodes