Add node and edge lookup and test cases