Add better node integration