Revised graphs to make data more object oriented