Add CallGraph Support