Initial graphs implementation and minor updates