Changes for updated comments and moved the graph assembly to init block