Fixed Node redefinition and map init