Updated GraphParser