added Graph and Co