Code modifications + ninject attached