Change structure of nodeToLocation