Added IoC, and working graph