Added more graph attributes