Refined architerture of Graph.h