For Controller IoC we have converted them from object to class
removed @Singleton annotation
fix merge conflict