diff --git a/android-studio-plugin/InFullMvpActivityJava_dagger2.11+/template.xml b/android-studio-plugin/InFullMvpActivityJava_dagger2.11+/template.xml
index ab8881a..d693b93 100644
--- a/android-studio-plugin/InFullMvpActivityJava_dagger2.11+/template.xml
+++ b/android-studio-plugin/InFullMvpActivityJava_dagger2.11+/template.xml
@@ -40,12 +40,6 @@
         suggest="${applicationPackage}"
         help="Path to .R of this app/module" />
 
-    <parameter
-        id="useApplicationComponent"
-        name="Use ApplicationComponent"
-        type="boolean"
-        default="true"
-        help="If true, ApplicationComponent will be used in generated Graph" />
 
     <parameter
         id="appComponentPackage"
diff --git a/android-studio-plugin/InfullAplicationKotlin_dagger2.11+/root/src/mvp_folder/Application.kt.ftl b/android-studio-plugin/InfullAplicationKotlin_dagger2.11+/root/src/mvp_folder/Application.kt.ftl
index 74798b4..d2016f7 100644
--- a/android-studio-plugin/InfullAplicationKotlin_dagger2.11+/root/src/mvp_folder/Application.kt.ftl
+++ b/android-studio-plugin/InfullAplicationKotlin_dagger2.11+/root/src/mvp_folder/Application.kt.ftl
@@ -6,11 +6,25 @@ import ${relativePackage}.di.Dagger${componentClass}
 import dagger.android.AndroidInjector
 import dagger.android.DispatchingAndroidInjector
 import dagger.android.HasActivityInjector
+<#if addDispatchingFragmentInjector>
+import android.app.Fragment
+import dagger.android.HasFragmentInjector
+</#if>
+<#if addDispatchingSupportFragmentInjector>
+import dagger.android.support.HasSupportFragmentInjector
+import android.support.v4.app.Fragment as SupportFragment
+</#if>
 import javax.inject.Inject
 
-class ${applicationClass} : Application(), HasActivityInjector {
+class ${applicationClass} : Application(), HasActivityInjector<#if addDispatchingFragmentInjector>, HasFragmentInjector</#if><#if addDispatchingSupportFragmentInjector>, HasSupportFragmentInjector</#if>  {
 
-    @Inject lateinit var dispatchingAndroidInjector: DispatchingAndroidInjector<Activity>
+    @Inject lateinit var dispatchingActivityInjector: DispatchingAndroidInjector<Activity>
+    <#if addDispatchingFragmentInjector>
+    @Inject lateinit var dispatchingFragmentInjector: DispatchingAndroidInjector<Fragment>
+    </#if>
+    <#if addDispatchingSupportFragmentInjector>
+    @Inject lateinit var dispatchingSupportFragmentInjector: DispatchingAndroidInjector<SupportFragment>
+    </#if>
 
     override fun onCreate() {
         super.onCreate()
@@ -20,5 +34,14 @@ class ${applicationClass} : Application(), HasActivityInjector {
                 .inject(this)
     }
 
-    override fun activityInjector(): AndroidInjector<Activity> = dispatchingAndroidInjector
+    override fun activityInjector(): AndroidInjector<Activity> = dispatchingActivityInjector
+    <#if addDispatchingFragmentInjector>
+
+    override fun fragmentInjector(): AndroidInjector<Fragment> = dispatchingFragmentInjector
+    </#if>
+    <#if addDispatchingSupportFragmentInjector>
+
+    override fun supportFragmentInjector(): AndroidInjector<SupportFragment> = dispatchingSupportFragmentInjector
+    </#if>
+
 }
\ No newline at end of file
diff --git a/android-studio-plugin/InfullAplicationKotlin_dagger2.11+/template.xml b/android-studio-plugin/InfullAplicationKotlin_dagger2.11+/template.xml
index a1e15ad..8f3feaa 100644
--- a/android-studio-plugin/InfullAplicationKotlin_dagger2.11+/template.xml
+++ b/android-studio-plugin/InfullAplicationKotlin_dagger2.11+/template.xml
@@ -40,6 +40,20 @@
         type="string"
         visibility="useApplicationComponent"/>
 
+    <parameter
+        name="with HasSupportFragmentInjector"
+        default="true"
+        help="Adds HasSupportFragmentInjector and logic for injecting support Fragments"
+        id="addDispatchingSupportFragmentInjector"
+        type="boolean"/>
+
+    <parameter
+        name="With HasFragmentInjector"
+        default="false"
+        help="Adds HasFragmentInjector and logic for injecting Fragments"
+        id="addDispatchingFragmentInjector"
+        type="boolean"/>
+
     <thumbs>
         <thumb>ifmdagger.png</thumb>
     </thumbs>
diff --git a/android-studio-plugin/template_usecause.png b/android-studio-plugin/template_usecause.png
index 36764a8..649740c 100644
Binary files a/android-studio-plugin/template_usecause.png and b/android-studio-plugin/template_usecause.png differ
diff --git a/sample-kotlin-dagger-2.1x/src/main/java/com/infullmobile/android/infullmvp/sample_dagger21x/application/SampleApp.kt b/sample-kotlin-dagger-2.1x/src/main/java/com/infullmobile/android/infullmvp/sample_dagger21x/application/SampleApp.kt
index ac5ace5..684b120 100644
--- a/sample-kotlin-dagger-2.1x/src/main/java/com/infullmobile/android/infullmvp/sample_dagger21x/application/SampleApp.kt
+++ b/sample-kotlin-dagger-2.1x/src/main/java/com/infullmobile/android/infullmvp/sample_dagger21x/application/SampleApp.kt
@@ -6,11 +6,16 @@ import com.infullmobile.android.infullmvp.sample_dagger21x.application.di.Dagger
 import dagger.android.AndroidInjector
 import dagger.android.DispatchingAndroidInjector
 import dagger.android.HasActivityInjector
+import dagger.android.HasFragmentInjector
+import dagger.android.support.HasSupportFragmentInjector
+import android.support.v4.app.Fragment as SupportFragment
 import javax.inject.Inject
 
-class SampleApp : Application(), HasActivityInjector {
+class SampleApp : Application(), HasActivityInjector, HasSupportFragmentInjector, HasFragmentInjector {
 
     @Inject lateinit var dispatchingAndroidInjector: DispatchingAndroidInjector<Activity>
+    @Inject lateinit var dispatchingSupportFragmentInjector: DispatchingAndroidInjector<SupportFragment>
+    @Inject lateinit var dispatchingFragmentInjector: DispatchingAndroidInjector<android.app.Fragment>
 
     override fun onCreate() {
         super.onCreate()
@@ -22,4 +27,8 @@ class SampleApp : Application(), HasActivityInjector {
 
     override fun activityInjector(): AndroidInjector<Activity> = dispatchingAndroidInjector
 
+    override fun fragmentInjector(): AndroidInjector<android.app.Fragment> = dispatchingFragmentInjector
+
+    override fun supportFragmentInjector(): AndroidInjector<SupportFragment> = dispatchingSupportFragmentInjector
+
 }
\ No newline at end of file