Replaced IoC framework with Ninject