Fixed errors regarding node language and prepared for old/new node diff function