Updated nodes setup