Graph should be made smarter