Refactoring : IoC added, Singleton added
Fix