Updated nodes factory and nodes creation mechanism. Some simplifications...