diff --git a/.travis.yml b/.travis.yml
index b73a91a..9ee4f14 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,11 +16,14 @@ cache:
 android:
   components:
     - tools
-    - build-tools-25.0.3
-    - android-25
+    - build-tools-26.0.2
+    - android-27
     - platform-tools
     - extra-android-m2repository
     - extra-google-m2repository
 
 script:
   ./gradlew build
+
+before_install:
+- yes | sdkmanager "platforms;android-27"
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6abbedf..f0b3dcb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,14 +1,37 @@
 # Changelog
 
+## 1.2.0 - 10/03/2018
+
+### Section class
+- Remove all deprecated constructors.
+- Add methods `isItemViewWillBeProvided`, `isHeaderViewWillBeProvided`, `isFooterViewWillBeProvided`, `isLoadingViewWillBeProvided`, `isFailedViewWillBeProvided` and `isEmptyViewWillBeProvided`.
+- Add methods `getItemView`, `getHeaderView`, `getFooterView`, `getLoadingView`, `getFailedView` and `getEmptyView`.
+
+### SectionedRecyclerViewAdapter class
+- Remove method `getSectionsMap`.
+- Add method `getCopyOfSectionsMap`
+- Add method `removeSection(Section)`.
+
+### SectionParameters class
+- Add factory method for `Builder` class.
+
+### SectionParameters.Builder class
+- Deprecate constructor with itemResourceId as parameter.
+- Add method `itemResourceId`.
+- Add methods `itemViewWillBeProvided`, `headerViewWillBeProvided`, `footerViewWillBeProvided`, `loadingViewWillBeProvided`, `failedViewWillBeProvided` and `emptyViewWillBeProvided`.
+
+### StatelessSection class
+- Remove all deprecated constructors.
+
 ## 1.1.3 - 22/07/2017
 
 ### Section class
-- Add checks for resource ids in `setState` and throw exception if missing
+- Add checks for resource ids in `setState` and throw exception if missing.
 
 ### SectionedRecyclerViewAdapter class
 - Add methods `notifyNotLoadedStateChanged`, `notifyStateChangedToLoaded` and `notifyStateChangedFromLoaded`.
 - Add methods `notifyHeaderInsertedInSection`, `notifyFooterInsertedInSection`, `notifyHeaderRemovedFromSection` and `notifyFooterRemovedFromSection`.
-- Add methods `notifySectionChangedToVisible` and `notifySectionChangedToInvisible`
+- Add methods `notifySectionChangedToVisible` and `notifySectionChangedToInvisible`.
 
 ## 1.1.2 - 30/06/2017
 ### SectionParameters class
diff --git a/README.md b/README.md
index 683eabc..47dd3c8 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ In addition, each Section can have its state(Loading/Loaded/Failed/Empty) contro
 Add this to the `dependencies` section in your project-level **build.gradle** file:
 
 ```groovy
-compile 'io.github.luizgrp.sectionedrecyclerviewadapter:sectionedrecyclerviewadapter:1.1.3'
+compile 'io.github.luizgrp.sectionedrecyclerviewadapter:sectionedrecyclerviewadapter:1.2.0'
 ```
 
 ## Basic usage
@@ -34,7 +34,8 @@ class MySection extends StatelessSection {
 
     public MySection() {
         // call constructor with layout resources for this Section header and items
-        super(new SectionParameters.Builder(R.layout.section_item)
+        super(SectionParameters.builder()
+                .itemResourceId(R.layout.section_item)
                 .headerResourceId(R.layout.section_header)
                 .build());
     }
diff --git a/app/build.gradle b/app/build.gradle
index 986f468..5cf08a3 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 27
+    buildToolsVersion '26.0.2'
 
     defaultConfig {
         applicationId "io.github.luizgrp.sectionedrecyclerviewadapter.demo"
-        minSdkVersion 11
-        targetSdkVersion 25
+        minSdkVersion 14
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
     }
@@ -22,9 +22,10 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     compile project(':library')
+    compile 'com.android.support:appcompat-v7:27.1.0'
+    compile 'com.android.support:design:27.1.0'
+    compile 'com.android.support:recyclerview-v7:27.1.0'
+    compile 'com.android.support:cardview-v7:27.1.0'
+
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:design:25.3.1'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
-    compile 'com.android.support:cardview-v7:25.3.1'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8d30539..ad1bc84 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.github.luizgrp.sectionedrecyclerviewadapter.demo">
+          package="io.github.luizgrp.sectionedrecyclerviewadapter.demo">
 
     <application
         android:allowBackup="true"
@@ -10,9 +10,9 @@
         android:theme="@style/AppTheme.NoActionBar">
         <activity android:name=".HomeActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
     </application>
diff --git a/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example1Fragment.java b/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example1Fragment.java
index 4cde0fa..26567b5 100644
--- a/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example1Fragment.java
+++ b/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example1Fragment.java
@@ -31,8 +31,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 
         sectionAdapter = new SectionedRecyclerViewAdapter();
 
-
-        for(char alphabet = 'A'; alphabet <= 'Z';alphabet++) {
+        for (char alphabet = 'A'; alphabet <= 'Z'; alphabet++) {
             List<String> contacts = getContactsWithLetter(alphabet);
 
             if (contacts.size() > 0) {
@@ -53,8 +52,9 @@ public void onResume() {
 
         if (getActivity() instanceof AppCompatActivity) {
             AppCompatActivity activity = ((AppCompatActivity) getActivity());
-            if (activity.getSupportActionBar() != null)
+            if (activity.getSupportActionBar() != null) {
                 activity.getSupportActionBar().setTitle(R.string.nav_example1);
+            }
         }
     }
 
@@ -76,7 +76,8 @@ private class ContactsSection extends StatelessSection {
         List<String> list;
 
         ContactsSection(String title, List<String> list) {
-            super(new SectionParameters.Builder(R.layout.section_ex1_item)
+            super(SectionParameters.builder()
+                    .itemResourceId(R.layout.section_ex1_item)
                     .headerResourceId(R.layout.section_ex1_header)
                     .build());
 
@@ -106,7 +107,11 @@ public void onBindItemViewHolder(RecyclerView.ViewHolder holder, int position) {
             itemHolder.rootView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    Toast.makeText(getContext(), String.format("Clicked on position #%s of Section %s", sectionAdapter.getPositionInSection(itemHolder.getAdapterPosition()), title), Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getContext(),
+                            String.format("Clicked on position #%s of Section %s",
+                                    sectionAdapter.getPositionInSection(itemHolder.getAdapterPosition()),
+                                    title),
+                            Toast.LENGTH_SHORT).show();
                 }
             });
         }
diff --git a/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example2Fragment.java b/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example2Fragment.java
index 8c25527..78a08b8 100644
--- a/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example2Fragment.java
+++ b/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example2Fragment.java
@@ -50,8 +50,9 @@ public void onResume() {
 
         if (getActivity() instanceof AppCompatActivity) {
             AppCompatActivity activity = ((AppCompatActivity) getActivity());
-            if (activity.getSupportActionBar() != null)
+            if (activity.getSupportActionBar() != null) {
                 activity.getSupportActionBar().setTitle(R.string.nav_example2);
+            }
         }
     }
 
@@ -69,7 +70,8 @@ private class NewsSection extends StatelessSection {
         int imgPlaceholderResId;
 
         NewsSection(int topic) {
-            super(new SectionParameters.Builder(R.layout.section_ex2_item)
+            super(SectionParameters.builder()
+                    .itemResourceId(R.layout.section_ex2_item)
                     .headerResourceId(R.layout.section_ex2_header)
                     .footerResourceId(R.layout.section_ex2_footer)
                     .build());
@@ -98,7 +100,6 @@ private class NewsSection extends StatelessSection {
                     this.imgPlaceholderResId = R.drawable.ic_directions_run_black_48dp;
                     break;
             }
-
         }
 
         private List<String> getNews(int arrayResource) {
@@ -128,7 +129,11 @@ public void onBindItemViewHolder(RecyclerView.ViewHolder holder, int position) {
             itemHolder.rootView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    Toast.makeText(getContext(), String.format("Clicked on position #%s of Section %s", sectionAdapter.getPositionInSection(itemHolder.getAdapterPosition()), title), Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getContext(),
+                            String.format("Clicked on position #%s of Section %s",
+                                    sectionAdapter.getPositionInSection(itemHolder.getAdapterPosition()),
+                                    title),
+                            Toast.LENGTH_SHORT).show();
                 }
             });
         }
diff --git a/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example3Fragment.java b/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example3Fragment.java
index e9c76e3..fabdba6 100644
--- a/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example3Fragment.java
+++ b/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example3Fragment.java
@@ -65,8 +65,9 @@ public void onResume() {
 
         if (getActivity() instanceof AppCompatActivity) {
             AppCompatActivity activity = ((AppCompatActivity) getActivity());
-            if (activity.getSupportActionBar() != null)
+            if (activity.getSupportActionBar() != null) {
                 activity.getSupportActionBar().setTitle(R.string.nav_example3);
+            }
         }
     }
 
@@ -91,8 +92,7 @@ public void run() {
 
                 if (failed == 1) {
                     section.setState(Section.State.FAILED);
-                }
-                else {
+                } else {
                     int arrayResource;
                     switch (section.getTopic()) {
                         case NewsSection.WORLD:
@@ -138,7 +138,8 @@ private class NewsSection extends Section {
         int imgPlaceholderResId;
 
         NewsSection(int topic) {
-            super(new SectionParameters.Builder(R.layout.section_ex3_item)
+            super(SectionParameters.builder()
+                    .itemResourceId(R.layout.section_ex3_item)
                     .headerResourceId(R.layout.section_ex3_header)
                     .footerResourceId(R.layout.section_ex3_footer)
                     .failedResourceId(R.layout.section_ex3_failed)
@@ -166,7 +167,6 @@ private class NewsSection extends Section {
                     this.imgPlaceholderResId = R.drawable.ic_directions_run_black_48dp;
                     break;
             }
-
         }
 
         int getTopic() {
@@ -200,7 +200,11 @@ public void onBindItemViewHolder(RecyclerView.ViewHolder holder, int position) {
             itemHolder.rootView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    Toast.makeText(getContext(), String.format("Clicked on position #%s of Section %s", sectionAdapter.getPositionInSection(itemHolder.getAdapterPosition()), title), Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getContext(),
+                            String.format("Clicked on position #%s of Section %s",
+                                    sectionAdapter.getPositionInSection(itemHolder.getAdapterPosition()),
+                                    title),
+                            Toast.LENGTH_SHORT).show();
                 }
             });
         }
diff --git a/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example4Fragment.java b/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example4Fragment.java
index 235106e..cecaa2a 100644
--- a/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example4Fragment.java
+++ b/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example4Fragment.java
@@ -31,8 +31,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
 
         sectionAdapter = new SectionedRecyclerViewAdapter();
 
-
-        for(char alphabet = 'A'; alphabet <= 'Z';alphabet++) {
+        for (char alphabet = 'A'; alphabet <= 'Z'; alphabet++) {
             List<String> contacts = getContactsWithLetter(alphabet);
 
             if (contacts.size() > 0) {
@@ -53,8 +52,9 @@ public void onResume() {
 
         if (getActivity() instanceof AppCompatActivity) {
             AppCompatActivity activity = ((AppCompatActivity) getActivity());
-            if (activity.getSupportActionBar() != null)
+            if (activity.getSupportActionBar() != null) {
                 activity.getSupportActionBar().setTitle(R.string.nav_example4);
+            }
         }
     }
 
@@ -77,7 +77,8 @@ private class ExpandableContactsSection extends StatelessSection {
         boolean expanded = true;
 
         ExpandableContactsSection(String title, List<String> list) {
-            super(new SectionParameters.Builder(R.layout.section_ex4_item)
+            super(SectionParameters.builder()
+                    .itemResourceId(R.layout.section_ex4_item)
                     .headerResourceId(R.layout.section_ex4_header)
                     .build());
 
@@ -87,7 +88,7 @@ private class ExpandableContactsSection extends StatelessSection {
 
         @Override
         public int getContentItemsTotal() {
-            return expanded? list.size() : 0;
+            return expanded ? list.size() : 0;
         }
 
         @Override
@@ -107,7 +108,11 @@ public void onBindItemViewHolder(RecyclerView.ViewHolder holder, int position) {
             itemHolder.rootView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    Toast.makeText(getContext(), String.format("Clicked on position #%s of Section %s", sectionAdapter.getPositionInSection(itemHolder.getAdapterPosition()), title), Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getContext(),
+                            String.format("Clicked on position #%s of Section %s",
+                                    sectionAdapter.getPositionInSection(itemHolder.getAdapterPosition()),
+                                    title),
+                            Toast.LENGTH_SHORT).show();
                 }
             });
         }
diff --git a/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example5Fragment.java b/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example5Fragment.java
index 2357b10..f104ce4 100644
--- a/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example5Fragment.java
+++ b/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example5Fragment.java
@@ -41,7 +41,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         glm.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
             @Override
             public int getSpanSize(int position) {
-                switch(sectionAdapter.getSectionItemViewType(position)) {
+                switch (sectionAdapter.getSectionItemViewType(position)) {
                     case SectionedRecyclerViewAdapter.VIEW_TYPE_HEADER:
                         return 2;
                     default:
@@ -61,8 +61,9 @@ public void onResume() {
 
         if (getActivity() instanceof AppCompatActivity) {
             AppCompatActivity activity = ((AppCompatActivity) getActivity());
-            if (activity.getSupportActionBar() != null)
+            if (activity.getSupportActionBar() != null) {
                 activity.getSupportActionBar().setTitle(R.string.nav_example5);
+            }
         }
     }
 
@@ -100,7 +101,8 @@ private class MovieSection extends StatelessSection {
         List<Movie> list;
 
         MovieSection(String title, List<Movie> list) {
-            super(new SectionParameters.Builder(R.layout.section_ex5_item)
+            super(SectionParameters.builder()
+                    .itemResourceId(R.layout.section_ex5_item)
                     .headerResourceId(R.layout.section_ex5_header)
                     .build());
 
diff --git a/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example6Fragment.java b/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example6Fragment.java
index 82da53a..ecff171 100644
--- a/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example6Fragment.java
+++ b/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example6Fragment.java
@@ -41,7 +41,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         glm.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
             @Override
             public int getSpanSize(int position) {
-                switch(sectionAdapter.getSectionItemViewType(position)) {
+                switch (sectionAdapter.getSectionItemViewType(position)) {
                     case SectionedRecyclerViewAdapter.VIEW_TYPE_HEADER:
                         return 2;
                     default:
@@ -61,8 +61,9 @@ public void onResume() {
 
         if (getActivity() instanceof AppCompatActivity) {
             AppCompatActivity activity = ((AppCompatActivity) getActivity());
-            if (activity.getSupportActionBar() != null)
+            if (activity.getSupportActionBar() != null) {
                 activity.getSupportActionBar().setTitle(R.string.nav_example6);
+            }
         }
     }
 
@@ -101,7 +102,8 @@ private class ExpandableMovieSection extends StatelessSection {
         boolean expanded = true;
 
         ExpandableMovieSection(String title, List<Movie> list) {
-            super(new SectionParameters.Builder(R.layout.section_ex6_item)
+            super(SectionParameters.builder()
+                    .itemResourceId(R.layout.section_ex6_item)
                     .headerResourceId(R.layout.section_ex6_header)
                     .build());
 
@@ -111,7 +113,7 @@ private class ExpandableMovieSection extends StatelessSection {
 
         @Override
         public int getContentItemsTotal() {
-            return expanded? list.size() : 0;
+            return expanded ? list.size() : 0;
         }
 
         @Override
diff --git a/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example7Fragment.java b/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example7Fragment.java
index 20c2c0c..35918a3 100644
--- a/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example7Fragment.java
+++ b/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example7Fragment.java
@@ -38,7 +38,7 @@ public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container,
 
         sectionAdapter = new SectionedRecyclerViewAdapter();
 
-        for(char alphabet = 'A'; alphabet <= 'Z';alphabet++) {
+        for (char alphabet = 'A'; alphabet <= 'Z'; alphabet++) {
             List<String> contacts = getContactsWithLetter(alphabet);
 
             if (contacts.size() > 0) {
@@ -67,8 +67,9 @@ public void onResume() {
 
         if (getActivity() instanceof AppCompatActivity) {
             AppCompatActivity activity = ((AppCompatActivity) getActivity());
-            if (activity.getSupportActionBar() != null)
+            if (activity.getSupportActionBar() != null) {
                 activity.getSupportActionBar().setTitle(R.string.nav_example7);
+            }
         }
     }
 
@@ -84,10 +85,9 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
     @Override
     public boolean onQueryTextChange(String query) {
 
-        // getSectionsMap requires library version 1.0.4+
-        for (Section section : sectionAdapter.getSectionsMap().values()) {
+        for (Section section : sectionAdapter.getCopyOfSectionsMap().values()) {
             if (section instanceof FilterableSection) {
-                ((FilterableSection)section).filter(query);
+                ((FilterableSection) section).filter(query);
             }
         }
         sectionAdapter.notifyDataSetChanged();
@@ -119,7 +119,8 @@ private class ContactsSection extends StatelessSection implements FilterableSect
         List<String> filteredList;
 
         ContactsSection(String title, List<String> list) {
-            super(new SectionParameters.Builder(R.layout.section_ex7_item)
+            super(SectionParameters.builder()
+                    .itemResourceId(R.layout.section_ex7_item)
                     .headerResourceId(R.layout.section_ex7_header)
                     .build());
 
@@ -128,8 +129,6 @@ private class ContactsSection extends StatelessSection implements FilterableSect
             this.filteredList = new ArrayList<>(list);
         }
 
-
-
         @Override
         public int getContentItemsTotal() {
             return filteredList.size();
@@ -152,7 +151,11 @@ public void onBindItemViewHolder(RecyclerView.ViewHolder holder, int position) {
             itemHolder.rootView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    Toast.makeText(getContext(), String.format("Clicked on position #%s of Section %s", sectionAdapter.getPositionInSection(itemHolder.getAdapterPosition()), title), Toast.LENGTH_SHORT).show();
+                    Toast.makeText(getContext(),
+                            String.format("Clicked on position #%s of Section %s",
+                                    sectionAdapter.getPositionInSection(itemHolder.getAdapterPosition()),
+                                    title),
+                            Toast.LENGTH_SHORT).show();
                 }
             });
         }
@@ -174,8 +177,7 @@ public void filter(String query) {
             if (TextUtils.isEmpty(query)) {
                 filteredList = new ArrayList<>(list);
                 this.setVisible(true);
-            }
-            else {
+            } else {
                 filteredList.clear();
                 for (String value : list) {
                     if (value.toLowerCase().contains(query.toLowerCase())) {
diff --git a/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example8Fragment.java b/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example8Fragment.java
index ba7c2a9..1723862 100644
--- a/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example8Fragment.java
+++ b/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/Example8Fragment.java
@@ -40,7 +40,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         glm.setSpanSizeLookup(new GridLayoutManager.SpanSizeLookup() {
             @Override
             public int getSpanSize(int position) {
-                switch(sectionAdapter.getSectionItemViewType(position)) {
+                switch (sectionAdapter.getSectionItemViewType(position)) {
                     case SectionedRecyclerViewAdapter.VIEW_TYPE_HEADER:
                         return 2;
                     default:
@@ -73,8 +73,9 @@ public void onResume() {
 
         if (getActivity() instanceof AppCompatActivity) {
             AppCompatActivity activity = ((AppCompatActivity) getActivity());
-            if (activity.getSupportActionBar() != null)
+            if (activity.getSupportActionBar() != null) {
                 activity.getSupportActionBar().setTitle(R.string.nav_example8);
+            }
         }
     }
 
@@ -114,7 +115,8 @@ private class NameSection extends StatelessSection {
         List<Person> list;
 
         NameSection(String tag, String title) {
-            super(new SectionParameters.Builder(R.layout.section_ex8_item)
+            super(SectionParameters.builder()
+                    .itemResourceId(R.layout.section_ex8_item)
                     .headerResourceId(R.layout.section_ex8_header)
                     .build());
 
@@ -148,7 +150,7 @@ public void onBindItemViewHolder(RecyclerView.ViewHolder holder, int position) {
             itemHolder.rootView.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    int adapterPosition = itemHolder.getAdapterPosition();
+                    final int adapterPosition = itemHolder.getAdapterPosition();
                     if (adapterPosition != RecyclerView.NO_POSITION) {
                         int positionInSection = sectionAdapter.getPositionInSection(adapterPosition);
 
@@ -167,14 +169,28 @@ public RecyclerView.ViewHolder getHeaderViewHolder(View view) {
 
         @Override
         public void onBindHeaderViewHolder(RecyclerView.ViewHolder holder) {
-            HeaderViewHolder headerHolder = (HeaderViewHolder) holder;
+            final HeaderViewHolder headerHolder = (HeaderViewHolder) holder;
 
             headerHolder.tvTitle.setText(title);
 
+            headerHolder.rootView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(final View view) {
+                    final int adapterPosition = headerHolder.getAdapterPosition();
+                    if (adapterPosition != RecyclerView.NO_POSITION) {
+                        final int sectionItemsTotal = getSectionItemsTotal();
+
+                        sectionAdapter.removeSection(TAG);
+
+                        sectionAdapter.notifyItemRangeRemoved(adapterPosition, sectionItemsTotal);
+                    }
+                }
+            });
+
             headerHolder.btnAdd.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    int positionToInsertItemAt = 0;
+                    final int positionToInsertItemAt = 0;
 
                     list.add(positionToInsertItemAt, getRandomName());
 
@@ -185,7 +201,7 @@ public void onClick(View v) {
             headerHolder.btnClear.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    int contentItemsTotal = getContentItemsTotal();
+                    final int contentItemsTotal = getContentItemsTotal();
 
                     list.clear();
 
@@ -197,6 +213,7 @@ public void onClick(View v) {
 
     private class HeaderViewHolder extends RecyclerView.ViewHolder {
 
+        private final View rootView;
         private final TextView tvTitle;
         private final Button btnAdd;
         private final Button btnClear;
@@ -204,6 +221,7 @@ private class HeaderViewHolder extends RecyclerView.ViewHolder {
         HeaderViewHolder(View view) {
             super(view);
 
+            rootView = view;
             tvTitle = (TextView) view.findViewById(R.id.tvTitle);
             btnAdd = (Button) view.findViewById(R.id.btnAdd);
             btnClear = (Button) view.findViewById(R.id.btnClear);
diff --git a/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/HomeActivity.java b/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/HomeActivity.java
index 847fe22..e0f1ff6 100644
--- a/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/HomeActivity.java
+++ b/app/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/demo/HomeActivity.java
@@ -13,7 +13,7 @@
 import android.view.MenuItem;
 
 public class HomeActivity extends AppCompatActivity
-        implements NavigationView.OnNavigationItemSelectedListener {
+    implements NavigationView.OnNavigationItemSelectedListener {
 
     private Toolbar toolbar;
 
@@ -26,7 +26,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
         ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
-                this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
+            this, drawer, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
         drawer.setDrawerListener(toggle);
         toggle.syncState();
 
@@ -38,7 +38,7 @@ protected void onCreate(Bundle savedInstanceState) {
             HomeFragment homeFragment = new HomeFragment();
 
             getSupportFragmentManager().beginTransaction()
-                    .add(R.id.fragment_container, homeFragment).commit();
+                .add(R.id.fragment_container, homeFragment).commit();
 
             drawer.openDrawer(GravityCompat.START);
         }
diff --git a/app/src/main/res/drawable/selector_btn.xml b/app/src/main/res/drawable/selector_btn.xml
index 1096935..26622ef 100644
--- a/app/src/main/res/drawable/selector_btn.xml
+++ b/app/src/main/res/drawable/selector_btn.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:drawable="@color/colorPrimaryDark" />
-    <item android:state_pressed="true" android:drawable="@color/colorPrimaryDark" />
-    <item android:drawable="@color/colorPrimary" />
+    <item android:state_selected="true" android:drawable="@color/colorPrimaryDark"/>
+    <item android:state_pressed="true" android:drawable="@color/colorPrimaryDark"/>
+    <item android:drawable="@color/colorPrimary"/>
 </selector>
diff --git a/app/src/main/res/drawable/selector_item.xml b/app/src/main/res/drawable/selector_item.xml
index 1870208..1fdfdc8 100644
--- a/app/src/main/res/drawable/selector_item.xml
+++ b/app/src/main/res/drawable/selector_item.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:drawable="@color/item_selected_background_color" />
-    <item android:state_pressed="true" android:drawable="@color/item_selected_background_color" />
-    <item android:drawable="@color/app_background_color" />
+    <item android:state_selected="true" android:drawable="@color/item_selected_background_color"/>
+    <item android:state_pressed="true" android:drawable="@color/item_selected_background_color"/>
+    <item android:drawable="@color/app_background_color"/>
 </selector>
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index f8007e4..cae2968 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    tools:openDrawer="start">
+                                        xmlns:app="http://schemas.android.com/apk/res-auto"
+                                        xmlns:tools="http://schemas.android.com/tools"
+                                        android:id="@+id/drawer_layout"
+                                        android:layout_width="match_parent"
+                                        android:layout_height="match_parent"
+                                        android:fitsSystemWindows="true"
+                                        tools:openDrawer="start">
 
     <include
         layout="@layout/app_bar_home"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"/>
 
     <android.support.design.widget.NavigationView
         android:id="@+id/nav_view"
@@ -20,6 +20,6 @@
         android:layout_gravity="start"
         android:fitsSystemWindows="true"
         app:headerLayout="@layout/nav_header_home"
-        app:menu="@menu/activity_home_drawer" />
+        app:menu="@menu/activity_home_drawer"/>
 
 </android.support.v4.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/app_bar_home.xml b/app/src/main/res/layout/app_bar_home.xml
index 47c58a9..b472b0e 100644
--- a/app/src/main/res/layout/app_bar_home.xml
+++ b/app/src/main/res/layout/app_bar_home.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    tools:context="io.github.luizgrp.sectionedrecyclerviewadapter.demo.HomeActivity">
+                                                 xmlns:app="http://schemas.android.com/apk/res-auto"
+                                                 xmlns:tools="http://schemas.android.com/tools"
+                                                 android:layout_width="match_parent"
+                                                 android:layout_height="match_parent"
+                                                 android:fitsSystemWindows="true"
+                                                 tools:context="io.github.luizgrp.sectionedrecyclerviewadapter.demo.HomeActivity">
 
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
@@ -17,10 +17,10 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
-            app:popupTheme="@style/PopupOverlay" />
+            app:popupTheme="@style/PopupOverlay"/>
 
     </android.support.design.widget.AppBarLayout>
 
-    <include layout="@layout/content_home" />
+    <include layout="@layout/content_home"/>
 
 </android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/content_home.xml b/app/src/main/res/layout/content_home.xml
index 006653a..61abfe5 100644
--- a/app/src/main/res/layout/content_home.xml
+++ b/app/src/main/res/layout/content_home.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context="io.github.luizgrp.sectionedrecyclerviewadapter.demo.HomeActivity"
-    tools:showIn="@layout/app_bar_home"
-    android:background="@color/app_background_color">
+                xmlns:app="http://schemas.android.com/apk/res-auto"
+                xmlns:tools="http://schemas.android.com/tools"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:layout_behavior="@string/appbar_scrolling_view_behavior"
+                tools:context="io.github.luizgrp.sectionedrecyclerviewadapter.demo.HomeActivity"
+                tools:showIn="@layout/app_bar_home"
+                android:background="@color/app_background_color">
 
     <FrameLayout
         android:id="@+id/fragment_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="match_parent"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_ex1.xml b/app/src/main/res/layout/fragment_ex1.xml
index 3e6c255..225e747 100644
--- a/app/src/main/res/layout/fragment_ex1.xml
+++ b/app/src/main/res/layout/fragment_ex1.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
 
     <android.support.v7.widget.RecyclerView
         xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/fragment_ex2.xml b/app/src/main/res/layout/fragment_ex2.xml
index 3e6c255..225e747 100644
--- a/app/src/main/res/layout/fragment_ex2.xml
+++ b/app/src/main/res/layout/fragment_ex2.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
 
     <android.support.v7.widget.RecyclerView
         xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/fragment_ex3.xml b/app/src/main/res/layout/fragment_ex3.xml
index 3e6c255..225e747 100644
--- a/app/src/main/res/layout/fragment_ex3.xml
+++ b/app/src/main/res/layout/fragment_ex3.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
 
     <android.support.v7.widget.RecyclerView
         xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/fragment_ex4.xml b/app/src/main/res/layout/fragment_ex4.xml
index 3e6c255..225e747 100644
--- a/app/src/main/res/layout/fragment_ex4.xml
+++ b/app/src/main/res/layout/fragment_ex4.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
 
     <android.support.v7.widget.RecyclerView
         xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/fragment_ex5.xml b/app/src/main/res/layout/fragment_ex5.xml
index 3e6c255..225e747 100644
--- a/app/src/main/res/layout/fragment_ex5.xml
+++ b/app/src/main/res/layout/fragment_ex5.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
 
     <android.support.v7.widget.RecyclerView
         xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/fragment_ex6.xml b/app/src/main/res/layout/fragment_ex6.xml
index 3e6c255..225e747 100644
--- a/app/src/main/res/layout/fragment_ex6.xml
+++ b/app/src/main/res/layout/fragment_ex6.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
 
     <android.support.v7.widget.RecyclerView
         xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/fragment_ex7.xml b/app/src/main/res/layout/fragment_ex7.xml
index 3e6c255..225e747 100644
--- a/app/src/main/res/layout/fragment_ex7.xml
+++ b/app/src/main/res/layout/fragment_ex7.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
 
     <android.support.v7.widget.RecyclerView
         xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/app/src/main/res/layout/fragment_ex8.xml b/app/src/main/res/layout/fragment_ex8.xml
index 92a2314..2bf7480 100644
--- a/app/src/main/res/layout/fragment_ex8.xml
+++ b/app/src/main/res/layout/fragment_ex8.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
 
     <Button
         android:id="@+id/btnAdd"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index f38dfd5..ab8ed1a 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/nav_header_home.xml b/app/src/main/res/layout/nav_header_home.xml
index 50626b7..9c8109a 100644
--- a/app/src/main/res/layout/nav_header_home.xml
+++ b/app/src/main/res/layout/nav_header_home.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/nav_header_height"
-    android:background="@color/colorPrimary"
-    android:gravity="bottom"
-    android:orientation="vertical"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:theme="@style/ThemeOverlay.AppCompat.Dark">
+              android:layout_width="match_parent"
+              android:layout_height="@dimen/nav_header_height"
+              android:background="@color/colorPrimary"
+              android:gravity="bottom"
+              android:orientation="vertical"
+              android:paddingBottom="@dimen/activity_vertical_margin"
+              android:paddingLeft="@dimen/activity_horizontal_margin"
+              android:paddingRight="@dimen/activity_horizontal_margin"
+              android:paddingTop="@dimen/activity_vertical_margin"
+              android:theme="@style/ThemeOverlay.AppCompat.Dark">
 
     <ImageView
         android:id="@+id/imageView"
diff --git a/app/src/main/res/layout/section_ex1_header.xml b/app/src/main/res/layout/section_ex1_header.xml
index 797f21b..a66bd87 100644
--- a/app/src/main/res/layout/section_ex1_header.xml
+++ b/app/src/main/res/layout/section_ex1_header.xml
@@ -16,7 +16,7 @@
         tools:text="Title test text"
         android:textColor="@color/colorPrimary"
         android:textStyle="bold"
-        android:id="@+id/tvTitle" />
+        android:id="@+id/tvTitle"/>
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/section_ex1_item.xml b/app/src/main/res/layout/section_ex1_item.xml
index f8488c1..d1472bc 100644
--- a/app/src/main/res/layout/section_ex1_item.xml
+++ b/app/src/main/res/layout/section_ex1_item.xml
@@ -15,7 +15,7 @@
         android:layout_alignParentLeft="true"
         android:layout_marginLeft="15dp"
         android:src="@drawable/ic_android_black_48dp"
-        android:id="@+id/imgItem" />
+        android:id="@+id/imgItem"/>
 
     <TextView
         android:layout_width="wrap_content"
@@ -24,7 +24,7 @@
         android:layout_toRightOf="@+id/imgItem"
         android:layout_marginLeft="15dp"
         tools:text="Item test text"
-        android:id="@+id/tvItem" />
+        android:id="@+id/tvItem"/>
 
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/section_ex2_footer.xml b/app/src/main/res/layout/section_ex2_footer.xml
index 748fe42..4e760a4 100644
--- a/app/src/main/res/layout/section_ex2_footer.xml
+++ b/app/src/main/res/layout/section_ex2_footer.xml
@@ -18,6 +18,6 @@
         android:text="@string/see_more"
         android:textColor="@color/colorPrimary"
         android:textStyle="bold"
-        android:id="@+id/tvSeeMore" />
+        android:id="@+id/tvSeeMore"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/section_ex2_header.xml b/app/src/main/res/layout/section_ex2_header.xml
index 34e9c50..42b30d8 100644
--- a/app/src/main/res/layout/section_ex2_header.xml
+++ b/app/src/main/res/layout/section_ex2_header.xml
@@ -16,7 +16,7 @@
         tools:text="Title test text"
         android:textColor="@color/colorPrimary"
         android:textStyle="bold"
-        android:id="@+id/tvTitle" />
+        android:id="@+id/tvTitle"/>
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/section_ex2_item.xml b/app/src/main/res/layout/section_ex2_item.xml
index 88d82ca..14b5143 100644
--- a/app/src/main/res/layout/section_ex2_item.xml
+++ b/app/src/main/res/layout/section_ex2_item.xml
@@ -15,7 +15,7 @@
         android:layout_centerVertical="true"
         android:layout_alignParentLeft="true"
         android:src="@drawable/ic_android_black_48dp"
-        android:id="@+id/imgItem" />
+        android:id="@+id/imgItem"/>
 
     <TextView
         android:layout_width="wrap_content"
@@ -30,7 +30,7 @@
         android:textSize="16sp"
         android:maxLines="2"
         android:ellipsize="end"
-        android:id="@+id/tvHeader" />
+        android:id="@+id/tvHeader"/>
 
     <TextView
         android:layout_width="wrap_content"
@@ -41,12 +41,12 @@
         android:layout_alignParentBottom="true"
         tools:text="Item test text"
         android:textSize="12sp"
-        android:id="@+id/tvDate" />
+        android:id="@+id/tvDate"/>
 
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_alignParentBottom="true"
-        android:background="@color/divider_color" />
+        android:background="@color/divider_color"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/section_ex3_footer.xml b/app/src/main/res/layout/section_ex3_footer.xml
index 748fe42..4e760a4 100644
--- a/app/src/main/res/layout/section_ex3_footer.xml
+++ b/app/src/main/res/layout/section_ex3_footer.xml
@@ -18,6 +18,6 @@
         android:text="@string/see_more"
         android:textColor="@color/colorPrimary"
         android:textStyle="bold"
-        android:id="@+id/tvSeeMore" />
+        android:id="@+id/tvSeeMore"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/section_ex3_header.xml b/app/src/main/res/layout/section_ex3_header.xml
index 34e9c50..42b30d8 100644
--- a/app/src/main/res/layout/section_ex3_header.xml
+++ b/app/src/main/res/layout/section_ex3_header.xml
@@ -16,7 +16,7 @@
         tools:text="Title test text"
         android:textColor="@color/colorPrimary"
         android:textStyle="bold"
-        android:id="@+id/tvTitle" />
+        android:id="@+id/tvTitle"/>
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/section_ex3_item.xml b/app/src/main/res/layout/section_ex3_item.xml
index 88d82ca..14b5143 100644
--- a/app/src/main/res/layout/section_ex3_item.xml
+++ b/app/src/main/res/layout/section_ex3_item.xml
@@ -15,7 +15,7 @@
         android:layout_centerVertical="true"
         android:layout_alignParentLeft="true"
         android:src="@drawable/ic_android_black_48dp"
-        android:id="@+id/imgItem" />
+        android:id="@+id/imgItem"/>
 
     <TextView
         android:layout_width="wrap_content"
@@ -30,7 +30,7 @@
         android:textSize="16sp"
         android:maxLines="2"
         android:ellipsize="end"
-        android:id="@+id/tvHeader" />
+        android:id="@+id/tvHeader"/>
 
     <TextView
         android:layout_width="wrap_content"
@@ -41,12 +41,12 @@
         android:layout_alignParentBottom="true"
         tools:text="Item test text"
         android:textSize="12sp"
-        android:id="@+id/tvDate" />
+        android:id="@+id/tvDate"/>
 
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_alignParentBottom="true"
-        android:background="@color/divider_color" />
+        android:background="@color/divider_color"/>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/section_ex4_header.xml b/app/src/main/res/layout/section_ex4_header.xml
index a19581e..a66c28f 100644
--- a/app/src/main/res/layout/section_ex4_header.xml
+++ b/app/src/main/res/layout/section_ex4_header.xml
@@ -17,7 +17,7 @@
         tools:text="Title test text"
         android:textColor="@color/colorPrimary"
         android:textStyle="bold"
-        android:id="@+id/tvTitle" />
+        android:id="@+id/tvTitle"/>
 
     <ImageView
         android:id="@+id/imgArrow"
diff --git a/app/src/main/res/layout/section_ex4_item.xml b/app/src/main/res/layout/section_ex4_item.xml
index f8488c1..d1472bc 100644
--- a/app/src/main/res/layout/section_ex4_item.xml
+++ b/app/src/main/res/layout/section_ex4_item.xml
@@ -15,7 +15,7 @@
         android:layout_alignParentLeft="true"
         android:layout_marginLeft="15dp"
         android:src="@drawable/ic_android_black_48dp"
-        android:id="@+id/imgItem" />
+        android:id="@+id/imgItem"/>
 
     <TextView
         android:layout_width="wrap_content"
@@ -24,7 +24,7 @@
         android:layout_toRightOf="@+id/imgItem"
         android:layout_marginLeft="15dp"
         tools:text="Item test text"
-        android:id="@+id/tvItem" />
+        android:id="@+id/tvItem"/>
 
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/section_ex5_header.xml b/app/src/main/res/layout/section_ex5_header.xml
index 15c197c..47b8f33 100644
--- a/app/src/main/res/layout/section_ex5_header.xml
+++ b/app/src/main/res/layout/section_ex5_header.xml
@@ -16,7 +16,7 @@
         tools:text="Title test text"
         android:textColor="@color/colorPrimary"
         android:textStyle="bold"
-        android:id="@+id/tvTitle" />
+        android:id="@+id/tvTitle"/>
 
     <Button
         android:id="@+id/btnMore"
diff --git a/app/src/main/res/layout/section_ex5_item.xml b/app/src/main/res/layout/section_ex5_item.xml
index 7404e8f..e575f38 100644
--- a/app/src/main/res/layout/section_ex5_item.xml
+++ b/app/src/main/res/layout/section_ex5_item.xml
@@ -25,12 +25,13 @@
             android:layout_height="100dp"
             android:layout_gravity="top"
             android:background="@color/image_placeholder_background_color">
+
             <ImageView
                 android:layout_width="45dp"
                 android:layout_height="45dp"
                 android:layout_gravity="center"
                 android:src="@drawable/ic_movie_black_48dp"
-                android:id="@+id/imgItem" />
+                android:id="@+id/imgItem"/>
         </FrameLayout>
 
         <TextView
@@ -42,7 +43,7 @@
             android:textSize="16sp"
             android:textColor="@color/black"
             tools:text="Item test text"
-            android:id="@+id/tvItem" />
+            android:id="@+id/tvItem"/>
 
         <TextView
             android:layout_width="wrap_content"
@@ -52,7 +53,7 @@
             android:textSize="12sp"
             android:textColor="@color/dark_grey"
             tools:text="Item test text"
-            android:id="@+id/tvSubItem" />
+            android:id="@+id/tvSubItem"/>
     </LinearLayout>
 
 </android.support.v7.widget.CardView>
diff --git a/app/src/main/res/layout/section_ex6_header.xml b/app/src/main/res/layout/section_ex6_header.xml
index e889d41..4116460 100644
--- a/app/src/main/res/layout/section_ex6_header.xml
+++ b/app/src/main/res/layout/section_ex6_header.xml
@@ -16,7 +16,7 @@
         tools:text="Title test text"
         android:textColor="@color/colorPrimary"
         android:textStyle="bold"
-        android:id="@+id/tvTitle" />
+        android:id="@+id/tvTitle"/>
 
     <ImageView
         android:id="@+id/imgArrow"
diff --git a/app/src/main/res/layout/section_ex6_item.xml b/app/src/main/res/layout/section_ex6_item.xml
index 7404e8f..e575f38 100644
--- a/app/src/main/res/layout/section_ex6_item.xml
+++ b/app/src/main/res/layout/section_ex6_item.xml
@@ -25,12 +25,13 @@
             android:layout_height="100dp"
             android:layout_gravity="top"
             android:background="@color/image_placeholder_background_color">
+
             <ImageView
                 android:layout_width="45dp"
                 android:layout_height="45dp"
                 android:layout_gravity="center"
                 android:src="@drawable/ic_movie_black_48dp"
-                android:id="@+id/imgItem" />
+                android:id="@+id/imgItem"/>
         </FrameLayout>
 
         <TextView
@@ -42,7 +43,7 @@
             android:textSize="16sp"
             android:textColor="@color/black"
             tools:text="Item test text"
-            android:id="@+id/tvItem" />
+            android:id="@+id/tvItem"/>
 
         <TextView
             android:layout_width="wrap_content"
@@ -52,7 +53,7 @@
             android:textSize="12sp"
             android:textColor="@color/dark_grey"
             tools:text="Item test text"
-            android:id="@+id/tvSubItem" />
+            android:id="@+id/tvSubItem"/>
     </LinearLayout>
 
 </android.support.v7.widget.CardView>
diff --git a/app/src/main/res/layout/section_ex7_header.xml b/app/src/main/res/layout/section_ex7_header.xml
index 797f21b..a66bd87 100644
--- a/app/src/main/res/layout/section_ex7_header.xml
+++ b/app/src/main/res/layout/section_ex7_header.xml
@@ -16,7 +16,7 @@
         tools:text="Title test text"
         android:textColor="@color/colorPrimary"
         android:textStyle="bold"
-        android:id="@+id/tvTitle" />
+        android:id="@+id/tvTitle"/>
 
     <View
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/section_ex7_item.xml b/app/src/main/res/layout/section_ex7_item.xml
index f8488c1..d1472bc 100644
--- a/app/src/main/res/layout/section_ex7_item.xml
+++ b/app/src/main/res/layout/section_ex7_item.xml
@@ -15,7 +15,7 @@
         android:layout_alignParentLeft="true"
         android:layout_marginLeft="15dp"
         android:src="@drawable/ic_android_black_48dp"
-        android:id="@+id/imgItem" />
+        android:id="@+id/imgItem"/>
 
     <TextView
         android:layout_width="wrap_content"
@@ -24,7 +24,7 @@
         android:layout_toRightOf="@+id/imgItem"
         android:layout_marginLeft="15dp"
         tools:text="Item test text"
-        android:id="@+id/tvItem" />
+        android:id="@+id/tvItem"/>
 
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/section_ex8_header.xml b/app/src/main/res/layout/section_ex8_header.xml
index 03309bc..9063a3a 100644
--- a/app/src/main/res/layout/section_ex8_header.xml
+++ b/app/src/main/res/layout/section_ex8_header.xml
@@ -15,7 +15,7 @@
         android:layout_margin="15dp"
         android:textColor="@color/colorPrimary"
         android:textStyle="bold"
-        tools:text="Title test text" />
+        tools:text="Title test text"/>
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/section_ex8_item.xml b/app/src/main/res/layout/section_ex8_item.xml
index 842345e..c895baa 100644
--- a/app/src/main/res/layout/section_ex8_item.xml
+++ b/app/src/main/res/layout/section_ex8_item.xml
@@ -25,12 +25,13 @@
             android:layout_height="100dp"
             android:layout_gravity="top"
             android:background="@color/image_placeholder_background_color">
+
             <ImageView
                 android:layout_width="45dp"
                 android:layout_height="45dp"
                 android:layout_gravity="center"
                 android:src="@drawable/ic_android_black_48dp"
-                android:id="@+id/imgItem" />
+                android:id="@+id/imgItem"/>
         </FrameLayout>
 
         <TextView
@@ -42,7 +43,7 @@
             android:textSize="16sp"
             android:textColor="@color/black"
             tools:text="Item test text"
-            android:id="@+id/tvItem" />
+            android:id="@+id/tvItem"/>
 
         <TextView
             android:layout_width="wrap_content"
@@ -52,7 +53,7 @@
             android:textSize="12sp"
             android:textColor="@color/dark_grey"
             tools:text="Item test text"
-            android:id="@+id/tvSubItem" />
+            android:id="@+id/tvSubItem"/>
     </LinearLayout>
 
 </android.support.v7.widget.CardView>
diff --git a/app/src/main/res/menu/activity_home_drawer.xml b/app/src/main/res/menu/activity_home_drawer.xml
index 19a40a5..3de1bc7 100644
--- a/app/src/main/res/menu/activity_home_drawer.xml
+++ b/app/src/main/res/menu/activity_home_drawer.xml
@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/nav_item1"
-        android:title="@string/nav_stateless" >
+        android:title="@string/nav_stateless">
         <menu>
             <item
                 android:id="@+id/nav_example1"
@@ -43,7 +43,7 @@
 
     <item
         android:id="@+id/nav_item2"
-        android:title="@string/nav_stateful" >
+        android:title="@string/nav_stateful">
         <menu>
             <item
                 android:id="@+id/nav_example3"
diff --git a/app/src/main/res/menu/menu_ex7.xml b/app/src/main/res/menu/menu_ex7.xml
index cbe5e38..abfc6a4 100644
--- a/app/src/main/res/menu/menu_ex7.xml
+++ b/app/src/main/res/menu/menu_ex7.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item android:id="@+id/action_search"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_search"
         android:title="@string/action_search"
         app:actionViewClass="android.support.v7.widget.SearchView"
         app:showAsAction="always"/>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9a344d9..4efb24b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -11,8 +11,8 @@
         <item name="windowNoTitle">true</item>
     </style>
 
-    <style name="AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+    <style name="AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
 
-    <style name="PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+    <style name="PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
 
 </resources>
diff --git a/build.gradle b/build.gradle
index 5a6296c..ef1fa61 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,15 +1,17 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:3.0.1'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 
diff --git a/config/checkstyle.xml b/config/checkstyle.xml
new file mode 100644
index 0000000..c7fca15
--- /dev/null
+++ b/config/checkstyle.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0"?>
+<!DOCTYPE module PUBLIC
+    "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+    "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<module name = "Checker">
+
+    <property name="charset" value="UTF-8"/>
+
+    <property name="severity" value="error"/>
+
+    <module name="FileTabCharacter">
+        <property name="eachLine" value="true"/>
+    </module>
+
+    <module name="TreeWalker">
+
+        <!-- Imports -->
+
+        <module name="RedundantImport">
+            <property name="severity" value="error"/>
+        </module>
+
+        <module name="AvoidStarImport">
+            <property name="severity" value="error"/>
+        </module>
+
+        <!-- General Code Style -->
+
+        <module name="LineLength">
+            <property name="max" value="150"/>
+            <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
+        </module>
+
+        <module name="EmptyBlock">
+            <property name="option" value="TEXT"/>
+            <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
+        </module>
+
+        <module name="EmptyCatchBlock">
+            <property name="exceptionVariableName" value="expected"/>
+        </module>
+
+        <module name="LeftCurly">
+        </module>
+
+        <module name="RightCurly">
+            <property name="option" value="alone"/>
+            <property name="tokens" value="CLASS_DEF, METHOD_DEF, CTOR_DEF, LITERAL_FOR, LITERAL_WHILE, LITERAL_DO, STATIC_INIT, INSTANCE_INIT"/>
+        </module>
+
+        <module name="RightCurly">
+            <property name="option" value="same"/>
+        </module>
+
+        <module name="NoFinalizer"/>
+
+        <module name="ArrayTypeStyle"/>
+
+        <module name="ModifierOrder"/>
+
+        <module name="Indentation">
+            <property name="basicOffset" value="4"/>
+            <property name="braceAdjustment" value="0"/>
+            <property name="caseIndent" value="4"/>
+            <property name="throwsIndent" value="4"/>
+            <property name="arrayInitIndent" value="2"/>
+        </module>
+
+        <!-- White Space -->
+
+        <module name="GenericWhitespace">
+            <message key="ws.followed"
+                     value="GenericWhitespace ''{0}'' is followed by whitespace."/>
+            <message key="ws.preceded"
+                     value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
+            <message key="ws.illegalFollow"
+                     value="GenericWhitespace ''{0}'' should followed by whitespace."/>
+            <message key="ws.notPreceded"
+                     value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
+        </module>
+
+        <module name="WhitespaceAround">
+            <property name="allowEmptyConstructors" value="true"/>
+            <property name="allowEmptyMethods" value="false"/>
+            <property name="allowEmptyTypes" value="false"/>
+            <property name="allowEmptyLoops" value="false"/>
+            <message key="ws.notFollowed"
+                     value="WhitespaceAround: ''{0}'' is not followed by whitespace. Empty blocks may only be represented as '{}' when not part of a multi-block statement (4.1.3)"/>
+            <message key="ws.notPreceded"
+                     value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
+            <property name="severity" value="error"/>
+        </module>
+
+        <module name="WhitespaceAfter">
+            <property name="tokens" value="COMMA, SEMI, TYPECAST"/>
+        </module>
+
+        <module name="NoWhitespaceBefore">
+            <property name="tokens" value="SEMI, DOT, POST_DEC, POST_INC"/>
+            <property name="allowLineBreaks" value="true"/>
+        </module>
+
+        <module name="NoWhitespaceAfter">
+            <property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS"/>
+            <property name="allowLineBreaks" value="true"/>
+        </module>
+
+        <!-- Naming -->
+
+        <module name="PackageName">
+            <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
+            <message key="name.invalidPattern"
+                     value="Package name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+
+        <module name="MethodName">
+            <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
+            <message key="name.invalidPattern"
+                     value="Method name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+
+        <module name="TypeName">
+            <message key="name.invalidPattern"
+                     value="Type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+
+        <module name="MemberName">
+            <property name="applyToPublic" value="false" />
+            <property name="applyToPackage" value="false" />
+            <property name="applyToProtected" value="false" />
+        </module>
+
+        <module name="ParameterName">
+            <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
+            <message key="name.invalidPattern"
+                     value="Parameter name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+
+        <module name="LocalVariableName">
+            <property name="tokens" value="VARIABLE_DEF"/>
+            <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
+            <property name="allowOneCharVarInForLoop" value="true"/>
+            <message key="name.invalidPattern"
+                     value="Local variable name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+
+        <module name="ClassTypeParameterName">
+            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+            <message key="name.invalidPattern"
+                     value="Class type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+
+        <module name="MethodTypeParameterName">
+            <property name="format" value="(^[A-Z][0-9]?)$|([A-Z][a-zA-Z0-9]*[T]$)"/>
+            <message key="name.invalidPattern"
+                     value="Method type name ''{0}'' must match pattern ''{1}''."/>
+        </module>
+
+    </module>
+
+</module>
\ No newline at end of file
diff --git a/config/pmd-ruleset.xml b/config/pmd-ruleset.xml
new file mode 100644
index 0000000..2d66bd6
--- /dev/null
+++ b/config/pmd-ruleset.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="Android Application Rules"
+         xmlns="http://pmd.sf.net/ruleset/1.0.0"
+         xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd"
+         xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd">
+
+    <description>Custom ruleset for ribot Android application</description>
+
+    <exclude-pattern>.*/R.java</exclude-pattern>
+    <exclude-pattern>.*/gen/.*</exclude-pattern>
+
+    <rule ref="rulesets/java/android.xml" />
+    <rule ref="rulesets/java/clone.xml" />
+    <rule ref="rulesets/java/finalizers.xml" />
+    <rule ref="rulesets/java/imports.xml">
+        <!-- Espresso is designed this way !-->
+        <exclude name="TooManyStaticImports" />
+    </rule>
+    <rule ref="rulesets/java/logging-java.xml">
+        <!-- This rule wasn't working properly and given errors in every var call info -->
+        <exclude name="GuardLogStatementJavaUtil" />
+    </rule>
+    <rule ref="rulesets/java/braces.xml">
+        <!-- We allow single line if's without braces -->
+        <exclude name="IfStmtsMustUseBraces" />
+    </rule>
+    <rule ref="rulesets/java/strings.xml" >
+        <!-- Exclude because causes problems with SQL Strings that usually require duplication -->
+        <exclude name="AvoidDuplicateLiterals"/>
+    </rule>
+    <rule ref="rulesets/java/basic.xml" />
+    <rule ref="rulesets/java/naming.xml">
+        <exclude name="AbstractNaming" />
+        <exclude name="LongVariable" />
+        <exclude name="ShortMethodName" />
+        <exclude name="ShortVariable" />
+        <exclude name="ShortClassName" />
+        <exclude name="VariableNamingConventions" />
+    </rule>
+</ruleset>
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 89e0d99..a5b6b0e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,17 +1,13 @@
 # Project-wide Gradle settings.
-
 # IDE (e.g. Android Studio) users:
 # Gradle settings configured through the IDE *will override*
 # any settings specified in this file.
-
 # For more details on how to configure your build environment visit
 # http://www.gradle.org/docs/current/userguide/build_environment.html
-
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 # Default value: -Xmx10248m -XX:MaxPermSize=256m
 # org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
-
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 02c2935..6e7a952 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jul 12 14:32:33 SGT 2017
+#Thu Nov 09 19:27:55 GMT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
diff --git a/library/build.gradle b/library/build.gradle
index 0e0c48e..7a19773 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -1,18 +1,19 @@
 apply plugin: 'com.android.library'
+apply from: "build_files/static-code-analysis.gradle"
 
 ext {
     PUBLISH_GROUP_ID = 'io.github.luizgrp.sectionedrecyclerviewadapter'
     PUBLISH_ARTIFACT_ID = 'sectionedrecyclerviewadapter'
-    PUBLISH_VERSION = '1.1.3'
+    PUBLISH_VERSION = '1.2.0'
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion 27
+    buildToolsVersion '26.0.2'
 
     defaultConfig {
-        minSdkVersion 11
-        targetSdkVersion 25
+        minSdkVersion 14
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
     }
@@ -26,11 +27,11 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:appcompat-v7:25.3.1'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
+    compile 'com.android.support:appcompat-v7:27.1.0'
+    compile 'com.android.support:recyclerview-v7:27.1.0'
 
     testCompile 'junit:junit:4.12'
-    testCompile "org.mockito:mockito-core:2.7.20"
+    testCompile "org.mockito:mockito-core:2.8.9"
 }
 
-apply from: 'android-release-aar.gradle'
+apply from: "build_files/android-release-aar.gradle"
diff --git a/library/android-release-aar.gradle b/library/build_files/android-release-aar.gradle
similarity index 100%
rename from library/android-release-aar.gradle
rename to library/build_files/android-release-aar.gradle
diff --git a/library/build_files/static-code-analysis.gradle b/library/build_files/static-code-analysis.gradle
new file mode 100644
index 0000000..b8daedf
--- /dev/null
+++ b/library/build_files/static-code-analysis.gradle
@@ -0,0 +1,59 @@
+apply plugin: 'checkstyle'
+apply plugin: 'pmd'
+apply plugin: 'findbugs'
+
+check.dependsOn 'checkstyle', 'pmd', 'findbugs'
+
+task checkstyle(type: Checkstyle) {
+    description 'Checks if the code adheres to a coding standard'
+    group 'verification'
+
+    configFile file("${project.rootDir}/config/checkstyle.xml")
+    source 'src'
+    include '**/*.java'
+    exclude '**/gen/**'
+
+    classpath = files()
+}
+
+task pmd(type: Pmd) {
+    description 'Finds common programming flaws'
+    group 'verification'
+
+    ruleSetFiles = files("${project.rootDir}/config/pmd-ruleset.xml")
+    ruleSets = []
+
+    source 'src'
+    include '**/*.java'
+    exclude '**/gen/**'
+
+    ignoreFailures = true
+
+    reports {
+        html.enabled = true
+    }
+}
+
+task findbugs(type: FindBugs, dependsOn:"assembleDebug") {
+    description 'Looks for bugs'
+    group 'verification'
+
+    effort = "max"
+    reportLevel = "high"
+
+    classes = files("$project.buildDir/intermediates/classes/")
+    classpath = files()
+
+    source 'src'
+    include '**/*.java'
+    exclude '**/gen/**'
+
+    reports {
+        xml.enabled = false
+        html.enabled = true
+    }
+}
+
+dependencies {
+    checkstyle "com.puppycrawl.tools:checkstyle:8.2"
+}
\ No newline at end of file
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
index 637d800..ca0c0d7 100644
--- a/library/src/main/AndroidManifest.xml
+++ b/library/src/main/AndroidManifest.xml
@@ -1,4 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest
     package="io.github.luizgrp.sectionedrecyclerviewadapter">
 
     <application>
diff --git a/library/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/Section.java b/library/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/Section.java
index 31d8346..66aa651 100644
--- a/library/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/Section.java
+++ b/library/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/Section.java
@@ -3,135 +3,103 @@
 import android.support.annotation.LayoutRes;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
+import android.view.ViewGroup;
 
 /**
  * Abstract Section to be used with {@link SectionedRecyclerViewAdapter}.
  */
+@SuppressWarnings({"WeakerAccess", "PMD.AvoidFieldNameMatchingMethodName"})
 public abstract class Section {
 
-    public enum State { LOADING, LOADED, FAILED, EMPTY }
+    public enum State {
+        LOADING,
+        LOADED,
+        FAILED,
+        EMPTY
+    }
 
     private State state = State.LOADED;
 
-    boolean visible = true;
-
-    boolean hasHeader = false;
-    boolean hasFooter = false;
-
-    @LayoutRes Integer headerResourceId;
-    @LayoutRes Integer footerResourceId;
-
-    @LayoutRes int itemResourceId;
-
-    @LayoutRes private Integer loadingResourceId;
-    @LayoutRes private Integer failedResourceId;
-    @LayoutRes private Integer emptyResourceId;
-
-    /**
-     * Create a Section object with loading/failed states, without header and footer
-     *
-     * @deprecated Replaced by {@link #Section(SectionParameters)}
-     *
-     * @param itemResourceId layout resource for its items
-     * @param loadingResourceId layout resource for its loading state
-     * @param failedResourceId layout resource for its failed state
-     */
-    @Deprecated
-    public Section(@LayoutRes int itemResourceId, @LayoutRes int loadingResourceId,
-                   @LayoutRes int failedResourceId) {
-        this(new SectionParameters.Builder(itemResourceId)
-                .loadingResourceId(loadingResourceId)
-                .failedResourceId(failedResourceId)
-                .build());
-    }
-
-    /**
-     * Create a Section object with loading/failed states, with a custom header but without footer
-     *
-     * @deprecated Replaced by {@link #Section(SectionParameters)}
+    private boolean visible = true;
+
+    private boolean hasHeader = false;
+    private boolean hasFooter = false;
+
+    @LayoutRes
+    private final Integer itemResourceId;
+    @LayoutRes
+    private final Integer headerResourceId;
+    @LayoutRes
+    private final Integer footerResourceId;
+    @LayoutRes
+    private final Integer loadingResourceId;
+    @LayoutRes
+    private final Integer failedResourceId;
+    @LayoutRes
+    private final Integer emptyResourceId;
+    private final boolean itemViewWillBeProvided;
+    private final boolean headerViewWillBeProvided;
+    private final boolean footerViewWillBeProvided;
+    private final boolean loadingViewWillBeProvided;
+    private final boolean failedViewWillBeProvided;
+    private final boolean emptyViewWillBeProvided;
+
+    /**
+     * Create a Section object based on {@link SectionParameters}.
      *
-     * @param headerResourceId layout resource for its header
-     * @param itemResourceId layout resource for its items
-     * @param loadingResourceId layout resource for its loading state
-     * @param failedResourceId layout resource for its failed state
-     */
-    @Deprecated
-    public Section(@LayoutRes int headerResourceId, @LayoutRes int itemResourceId,
-                   @LayoutRes int loadingResourceId, @LayoutRes int failedResourceId) {
-        this(new SectionParameters.Builder(itemResourceId)
-                .headerResourceId(headerResourceId)
-                .loadingResourceId(loadingResourceId)
-                .failedResourceId(failedResourceId)
-                .build());
-    }
-
-    /**
-     * Create a Section object with loading/failed states, with a custom header and a custom footer
-     *
-     * @deprecated Replaced by {@link #Section(SectionParameters)}
-     *
-     * @param headerResourceId layout resource for its header
-     * @param footerResourceId layout resource for its footer
-     * @param itemResourceId layout resource for its items
-     * @param loadingResourceId layout resource for its loading state
-     * @param failedResourceId layout resource for its failed state
-     */
-    @Deprecated
-    public Section(@LayoutRes int headerResourceId, @LayoutRes int footerResourceId,
-                   @LayoutRes int itemResourceId, @LayoutRes int loadingResourceId,
-                   @LayoutRes int failedResourceId) {
-        this(new SectionParameters.Builder(itemResourceId)
-                .headerResourceId(headerResourceId)
-                .footerResourceId(footerResourceId)
-                .loadingResourceId(loadingResourceId)
-                .failedResourceId(failedResourceId)
-                .build());
-    }
-
-    /**
-     * Create a Section object based on {@link SectionParameters}
      * @param sectionParameters section parameters
      */
     public Section(SectionParameters sectionParameters) {
+        this.itemResourceId = sectionParameters.itemResourceId;
         this.headerResourceId = sectionParameters.headerResourceId;
         this.footerResourceId = sectionParameters.footerResourceId;
-        this.itemResourceId = sectionParameters.itemResourceId;
         this.loadingResourceId = sectionParameters.loadingResourceId;
         this.failedResourceId = sectionParameters.failedResourceId;
         this.emptyResourceId = sectionParameters.emptyResourceId;
-
-        this.hasHeader = (this.headerResourceId != null);
-        this.hasFooter = (this.footerResourceId != null);
+        this.itemViewWillBeProvided = sectionParameters.itemViewWillBeProvided;
+        this.headerViewWillBeProvided = sectionParameters.headerViewWillBeProvided;
+        this.footerViewWillBeProvided = sectionParameters.footerViewWillBeProvided;
+        this.loadingViewWillBeProvided = sectionParameters.loadingViewWillBeProvided;
+        this.failedViewWillBeProvided = sectionParameters.failedViewWillBeProvided;
+        this.emptyViewWillBeProvided = sectionParameters.emptyViewWillBeProvided;
+
+        this.hasHeader = (this.headerResourceId != null) || this.headerViewWillBeProvided;
+        this.hasFooter = (this.footerResourceId != null) || this.footerViewWillBeProvided;
     }
 
     /**
-     * Set the State of this Section
+     * Set the State of this Section.
+     *
      * @param state state of this section
      */
     public final void setState(State state) {
         switch (state) {
             case LOADING:
-                if (loadingResourceId == null) {
-                    throw new IllegalStateException("Missing 'loading state' resource id");
+                if (loadingResourceId == null && !loadingViewWillBeProvided) {
+                    throw new IllegalStateException(
+                            "Resource id for 'loading state' should be provided or 'loadingViewWillBeProvided' should be set");
                 }
                 break;
             case FAILED:
-                if (failedResourceId == null) {
-                    throw new IllegalStateException("Missing 'failed state' resource id");
+                if (failedResourceId == null && !failedViewWillBeProvided) {
+                    throw new IllegalStateException("Resource id for 'failed state' should be provided or 'failedViewWillBeProvided' should be set");
                 }
                 break;
             case EMPTY:
-                if (emptyResourceId == null) {
-                    throw new IllegalStateException("Missing 'empty state' resource id");
+                if (emptyResourceId == null && !emptyViewWillBeProvided) {
+                    throw new IllegalStateException("Resource id for 'empty state' should be provided or 'emptyViewWillBeProvided' should be set");
                 }
                 break;
+            default:
+                break;
         }
 
         this.state = state;
     }
 
     /**
-     * Return the current State of this Section
+     * Return the current State of this Section.
+     *
      * @return current state of this section
      */
     public final State getState() {
@@ -139,7 +107,8 @@ public final State getState() {
     }
 
     /**
-     * Check if this Section is visible
+     * Check if this Section is visible.
+     *
      * @return true if this Section is visible
      */
     public final boolean isVisible() {
@@ -147,7 +116,8 @@ public final boolean isVisible() {
     }
 
     /**
-     * Set if this Section is visible
+     * Set if this Section is visible.
+     *
      * @param visible true if this Section is visible
      */
     public final void setVisible(boolean visible) {
@@ -155,7 +125,8 @@ public final void setVisible(boolean visible) {
     }
 
     /**
-     * Check if this Section has a header
+     * Check if this Section has a header.
+     *
      * @return true if this Section has a header
      */
     public final boolean hasHeader() {
@@ -163,7 +134,8 @@ public final boolean hasHeader() {
     }
 
     /**
-     * Set if this Section has header
+     * Set if this Section has header.
+     *
      * @param hasHeader true if this Section has a header
      */
     public final void setHasHeader(boolean hasHeader) {
@@ -171,7 +143,8 @@ public final void setHasHeader(boolean hasHeader) {
     }
 
     /**
-     * Check if this Section has a footer
+     * Check if this Section has a footer.
+     *
      * @return true if this Section has a footer
      */
     public final boolean hasFooter() {
@@ -179,7 +152,8 @@ public final boolean hasFooter() {
     }
 
     /**
-     * Set if this Section has footer
+     * Set if this Section has footer.
+     *
      * @param hasFooter true if this Section has a footer
      */
     public final void setHasFooter(boolean hasFooter) {
@@ -187,7 +161,38 @@ public final void setHasFooter(boolean hasFooter) {
     }
 
     /**
-     * Return the layout resource id of the header
+     * Return whether the item view is provided through {@link #getItemView(ViewGroup)}.
+     * If false, the item view is inflated using the resource from {@link #getItemResourceId()}.
+     *
+     * @return whether the item view is provided through {@link #getItemView(ViewGroup)}.
+     */
+    public final boolean isItemViewWillBeProvided() {
+        return itemViewWillBeProvided;
+    }
+
+    /**
+     * Return the layout resource id of the item.
+     *
+     * @return layout resource id of the item
+     */
+    public final Integer getItemResourceId() {
+        return itemResourceId;
+    }
+
+    /**
+     * Return whether the header view is provided through {@link #getHeaderView(ViewGroup)}.
+     * If false, the header view is inflated using the resource from
+     * {@link #getHeaderResourceId()}.
+     *
+     * @return whether the header view is provided through {@link #getHeaderView(ViewGroup)}.
+     */
+    public final boolean isHeaderViewWillBeProvided() {
+        return headerViewWillBeProvided;
+    }
+
+    /**
+     * Return the layout resource id of the header.
+     *
      * @return layout resource id of the header
      */
     public final Integer getHeaderResourceId() {
@@ -195,7 +200,19 @@ public final Integer getHeaderResourceId() {
     }
 
     /**
-     * Return the layout resource id of the footer
+     * Return whether the footer view is provided through {@link #getFooterView(ViewGroup)}.
+     * If false, the footer view is inflated using the resource from
+     * {@link #getFooterResourceId()}.
+     *
+     * @return whether the footer view is provided through {@link #getFooterView(ViewGroup)}.
+     */
+    public final boolean isFooterViewWillBeProvided() {
+        return footerViewWillBeProvided;
+    }
+
+    /**
+     * Return the layout resource id of the footer.
+     *
      * @return layout resource id of the footer
      */
     public final Integer getFooterResourceId() {
@@ -203,15 +220,19 @@ public final Integer getFooterResourceId() {
     }
 
     /**
-     * Return the layout resource id of the item
-     * @return layout resource id of the item
+     * Return whether the loading view is provided through {@link #getLoadingView(ViewGroup)}.
+     * If false, the loading view is inflated using the resource from
+     * {@link #getLoadingResourceId()}.
+     *
+     * @return whether the loading view is provided through {@link #getLoadingView(ViewGroup)}.
      */
-    public final int getItemResourceId() {
-        return itemResourceId;
+    public final boolean isLoadingViewWillBeProvided() {
+        return loadingViewWillBeProvided;
     }
 
     /**
-     * Return the layout resource id of the loading view
+     * Return the layout resource id of the loading view.
+     *
      * @return layout resource id of the loading view
      */
     public final Integer getLoadingResourceId() {
@@ -219,7 +240,19 @@ public final Integer getLoadingResourceId() {
     }
 
     /**
-     * Return the layout resource id of the failed view
+     * Return whether the failed view is provided through {@link #getFailedView(ViewGroup)}.
+     * If false, the failed view is inflated using the resource from
+     * {@link #getFailedResourceId()}.
+     *
+     * @return whether the failed view is provided through {@link #getFailedView(ViewGroup)}.
+     */
+    public final boolean isFailedViewWillBeProvided() {
+        return failedViewWillBeProvided;
+    }
+
+    /**
+     * Return the layout resource id of the failed view.
+     *
      * @return layout resource id of the failed view
      */
     public final Integer getFailedResourceId() {
@@ -227,7 +260,19 @@ public final Integer getFailedResourceId() {
     }
 
     /**
-     * Return the layout resource id of the empty view
+     * Return whether the empty view is provided through {@link #getEmptyView(ViewGroup)}.
+     * If false, the empty view is inflated using the resource from
+     * {@link #getEmptyResourceId()}.
+     *
+     * @return whether the empty view is provided through {@link #getEmptyView(ViewGroup)}.
+     */
+    public final boolean isEmptyViewWillBeProvided() {
+        return emptyViewWillBeProvided;
+    }
+
+    /**
+     * Return the layout resource id of the empty view.
+     *
      * @return layout resource id of the empty view
      */
     public final Integer getEmptyResourceId() {
@@ -236,8 +281,9 @@ public final Integer getEmptyResourceId() {
 
     /**
      * Bind the data to the ViewHolder for the Content of this Section, that can be the Items,
-     * Loading view or Failed view, depending on the current state of the section
-     * @param holder ViewHolder for the Content of this Section
+     * Loading view or Failed view, depending on the current state of the section.
+     *
+     * @param holder   ViewHolder for the Content of this Section
      * @param position position of the item in the Section, not in the RecyclerView
      */
     public final void onBindContentViewHolder(RecyclerView.ViewHolder holder, int position) {
@@ -261,7 +307,8 @@ public final void onBindContentViewHolder(RecyclerView.ViewHolder holder, int po
 
     /**
      * Return the total of items of this Section, including content items (according to the section
-     * state) plus header and footer
+     * state) plus header and footer.
+     *
      * @return total of items of this section
      */
     public final int getSectionItemsTotal() {
@@ -284,17 +331,59 @@ public final int getSectionItemsTotal() {
                 throw new IllegalStateException("Invalid state");
         }
 
-        return contentItemsTotal + (hasHeader? 1 : 0) + (hasFooter? 1 : 0);
+        return contentItemsTotal + (hasHeader ? 1 : 0) + (hasFooter ? 1 : 0);
     }
 
     /**
-     * Return the total of items of this Section
+     * Return the total of items of this Section.
+     *
      * @return total of items of this Section
      */
     public abstract int getContentItemsTotal();
 
     /**
-     * Return the ViewHolder for the Header of this Section
+     * Creates the View for a single Item. This must be implemented if and only if
+     * {@link #isItemViewWillBeProvided()} is true.
+     *
+     * @param parent The parent view. Note that there is no need to attach the new view.
+     * @return View for an Item of this Section.
+     */
+    public View getItemView(ViewGroup parent) {
+        throw new UnsupportedOperationException(
+                "You need to implement getItemView() if you set itemViewWillBeProvided");
+    }
+
+    /**
+     * Return the ViewHolder for a single Item of this Section.
+     *
+     * @param view View created by getItemView or inflated resource returned by getItemResourceId
+     * @return ViewHolder for the Item of this Section
+     */
+    public abstract RecyclerView.ViewHolder getItemViewHolder(View view);
+
+    /**
+     * Bind the data to the ViewHolder for an Item of this Section.
+     *
+     * @param holder   ViewHolder for the Item of this Section
+     * @param position position of the item in the Section, not in the RecyclerView
+     */
+    public abstract void onBindItemViewHolder(RecyclerView.ViewHolder holder, int position);
+
+    /**
+     * Creates the View for the Header. This must be implemented if and only if
+     * {@link #isHeaderViewWillBeProvided()} is true.
+     *
+     * @param parent The parent view. Note that there is no need to attach the new view.
+     * @return View for the Header of this Section.
+     */
+    public View getHeaderView(@SuppressWarnings("unused") ViewGroup parent) {
+        throw new UnsupportedOperationException(
+                "You need to implement getHeaderView() if you set headerViewWillBeProvided");
+    }
+
+    /**
+     * Return the ViewHolder for the Header of this Section.
+     *
      * @param view View inflated by resource returned by getHeaderResourceId
      * @return ViewHolder for the Header of this Section
      */
@@ -303,7 +392,8 @@ public RecyclerView.ViewHolder getHeaderViewHolder(View view) {
     }
 
     /**
-     * Bind the data to the ViewHolder for the Header of this Section
+     * Bind the data to the ViewHolder for the Header of this Section.
+     *
      * @param holder ViewHolder for the Header of this Section
      */
     public void onBindHeaderViewHolder(RecyclerView.ViewHolder holder) {
@@ -311,7 +401,20 @@ public void onBindHeaderViewHolder(RecyclerView.ViewHolder holder) {
     }
 
     /**
-     * Return the ViewHolder for the Footer of this Section
+     * Creates the View for the Footer. This must be implemented if and only if
+     * {@link #isFooterViewWillBeProvided()} is true.
+     *
+     * @param parent The parent view. Note that there is no need to attach the new view.
+     * @return View for the Footer of this Section.
+     */
+    public View getFooterView(@SuppressWarnings("unused") ViewGroup parent) {
+        throw new UnsupportedOperationException(
+                "You need to implement getFooterView() if you set footerViewWillBeProvided");
+    }
+
+    /**
+     * Return the ViewHolder for the Footer of this Section.
+     *
      * @param view View inflated by resource returned by getFooterResourceId
      * @return ViewHolder for the Footer of this Section
      */
@@ -320,7 +423,8 @@ public RecyclerView.ViewHolder getFooterViewHolder(View view) {
     }
 
     /**
-     * Bind the data to the ViewHolder for the Footer of this Section
+     * Bind the data to the ViewHolder for the Footer of this Section.
+     *
      * @param holder ViewHolder for the Footer of this Section
      */
     public void onBindFooterViewHolder(RecyclerView.ViewHolder holder) {
@@ -328,28 +432,30 @@ public void onBindFooterViewHolder(RecyclerView.ViewHolder holder) {
     }
 
     /**
-     * Return the ViewHolder for a single Item of this Section
-     * @param view View inflated by resource returned by getItemResourceId
-     * @return ViewHolder for the Item of this Section
-     */
-    public abstract RecyclerView.ViewHolder getItemViewHolder(View view);
-    /**
-     * Bind the data to the ViewHolder for an Item of this Section
-     * @param holder ViewHolder for the Item of this Section
-     * @param position position of the item in the Section, not in the RecyclerView
+     * Creates the View for the Loading state. This must be implemented if and only if
+     * {@link #isLoadingViewWillBeProvided()} is true.
+     *
+     * @param parent The parent view. Note that there is no need to attach the new view.
+     * @return View for the Loading state of this Section.
      */
-    public abstract void onBindItemViewHolder(RecyclerView.ViewHolder holder, int position);
+    public View getLoadingView(@SuppressWarnings("unused") ViewGroup parent) {
+        throw new UnsupportedOperationException(
+                "You need to implement getLoadingView() if you set loadingViewWillBeProvided");
+    }
 
     /**
-     * Return the ViewHolder for the Loading state of this Section
+     * Return the ViewHolder for the Loading state of this Section.
+     *
      * @param view View inflated by resource returned by getItemResourceId
      * @return ViewHolder for the Loading state of this Section
      */
     public RecyclerView.ViewHolder getLoadingViewHolder(View view) {
         return new SectionedRecyclerViewAdapter.EmptyViewHolder(view);
     }
+
     /**
-     * Bind the data to the ViewHolder for Loading state of this Section
+     * Bind the data to the ViewHolder for Loading state of this Section.
+     *
      * @param holder ViewHolder for the Loading state of this Section
      */
     public void onBindLoadingViewHolder(RecyclerView.ViewHolder holder) {
@@ -357,15 +463,30 @@ public void onBindLoadingViewHolder(RecyclerView.ViewHolder holder) {
     }
 
     /**
-     * Return the ViewHolder for the Failed state of this Section
+     * Creates the View for the Failed state. This must be implemented if and only if
+     * {@link #isFailedViewWillBeProvided()} is true.
+     *
+     * @param parent The parent view. Note that there is no need to attach the new view.
+     * @return View for the Failed state of this Section.
+     */
+    public View getFailedView(@SuppressWarnings("unused") ViewGroup parent) {
+        throw new UnsupportedOperationException(
+                "You need to implement getFailedView() if you set failedViewWillBeProvided");
+    }
+
+    /**
+     * Return the ViewHolder for the Failed state of this Section.
+     *
      * @param view View inflated by resource returned by getItemResourceId
      * @return ViewHolder for the Failed of this Section
      */
     public RecyclerView.ViewHolder getFailedViewHolder(View view) {
         return new SectionedRecyclerViewAdapter.EmptyViewHolder(view);
     }
+
     /**
-     * Bind the data to the ViewHolder for the Failed state of this Section
+     * Bind the data to the ViewHolder for the Failed state of this Section.
+     *
      * @param holder ViewHolder for the Failed state of this Section
      */
     public void onBindFailedViewHolder(RecyclerView.ViewHolder holder) {
@@ -373,15 +494,30 @@ public void onBindFailedViewHolder(RecyclerView.ViewHolder holder) {
     }
 
     /**
-     * Return the ViewHolder for the Empty state of this Section
+     * Creates the View for the Empty state. This must be implemented if and only if
+     * {@link #isEmptyViewWillBeProvided()} is true.
+     *
+     * @param parent The parent view. Note that there is no need to attach the new view.
+     * @return View for the Empty state of this Section.
+     */
+    public View getEmptyView(@SuppressWarnings("unused") ViewGroup parent) {
+        throw new UnsupportedOperationException(
+                "You need to implement getEmptyView() if you set emptyViewWillBeProvided");
+    }
+
+    /**
+     * Return the ViewHolder for the Empty state of this Section.
+     *
      * @param view View inflated by resource returned by getItemResourceId
      * @return ViewHolder for the Empty of this Section
      */
     public RecyclerView.ViewHolder getEmptyViewHolder(View view) {
         return new SectionedRecyclerViewAdapter.EmptyViewHolder(view);
     }
+
     /**
-     * Bind the data to the ViewHolder for the Empty state of this Section
+     * Bind the data to the ViewHolder for the Empty state of this Section.
+     *
      * @param holder ViewHolder for the Empty state of this Section
      */
     public void onBindEmptyViewHolder(RecyclerView.ViewHolder holder) {
diff --git a/library/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/SectionParameters.java b/library/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/SectionParameters.java
index 22589d8..61c84a2 100644
--- a/library/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/SectionParameters.java
+++ b/library/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/SectionParameters.java
@@ -5,36 +5,145 @@
 /**
  * Class used as constructor parameters of {@link Section}.
  */
-public class SectionParameters {
-    @LayoutRes public final Integer headerResourceId;
-    @LayoutRes public final Integer footerResourceId;
-    @LayoutRes public final int itemResourceId;
-    @LayoutRes public final Integer loadingResourceId;
-    @LayoutRes public final Integer failedResourceId;
-    @LayoutRes public final Integer emptyResourceId;
+@SuppressWarnings({"WeakerAccess", "PMD.AvoidFieldNameMatchingMethodName"})
+public final class SectionParameters {
+    @LayoutRes
+    public final Integer itemResourceId;
+    @LayoutRes
+    public final Integer headerResourceId;
+    @LayoutRes
+    public final Integer footerResourceId;
+    @LayoutRes
+    public final Integer loadingResourceId;
+    @LayoutRes
+    public final Integer failedResourceId;
+    @LayoutRes
+    public final Integer emptyResourceId;
+    public final boolean itemViewWillBeProvided;
+    public final boolean headerViewWillBeProvided;
+    public final boolean footerViewWillBeProvided;
+    public final boolean loadingViewWillBeProvided;
+    public final boolean failedViewWillBeProvided;
+    public final boolean emptyViewWillBeProvided;
+
+    private SectionParameters(Builder builder) {
+        this.itemResourceId = builder.itemResourceId;
+        this.headerResourceId = builder.headerResourceId;
+        this.footerResourceId = builder.footerResourceId;
+        this.loadingResourceId = builder.loadingResourceId;
+        this.failedResourceId = builder.failedResourceId;
+        this.emptyResourceId = builder.emptyResourceId;
+        this.itemViewWillBeProvided = builder.itemViewWillBeProvided;
+        this.headerViewWillBeProvided = builder.headerViewWillBeProvided;
+        this.footerViewWillBeProvided = builder.footerViewWillBeProvided;
+        this.loadingViewWillBeProvided = builder.loadingViewWillBeProvided;
+        this.failedViewWillBeProvided = builder.failedViewWillBeProvided;
+        this.emptyViewWillBeProvided = builder.emptyViewWillBeProvided;
+
+        if (itemResourceId != null && itemViewWillBeProvided) {
+            throw new IllegalArgumentException(
+                    "itemResourceId and itemViewWillBeProvided cannot both be set");
+        } else if (itemResourceId == null && !itemViewWillBeProvided) {
+            throw new IllegalArgumentException(
+                    "Either itemResourceId or itemViewWillBeProvided must be set");
+        }
+        if (headerResourceId != null && headerViewWillBeProvided) {
+            throw new IllegalArgumentException(
+                    "headerResourceId and headerViewWillBeProvided cannot both be set");
+        }
+        if (footerResourceId != null && footerViewWillBeProvided) {
+            throw new IllegalArgumentException(
+                    "footerResourceId and footerViewWillBeProvided cannot both be set");
+        }
+        if (loadingResourceId != null && loadingViewWillBeProvided) {
+            throw new IllegalArgumentException(
+                    "loadingResourceId and loadingViewWillBeProvided cannot both be set");
+        }
+        if (failedResourceId != null && failedViewWillBeProvided) {
+            throw new IllegalArgumentException(
+                    "failedResourceId and failedViewWillBeProvided cannot both be set");
+        }
+        if (emptyResourceId != null && emptyViewWillBeProvided) {
+            throw new IllegalArgumentException(
+                    "emptyResourceId and emptyViewWillBeProvided cannot both be set");
+        }
+    }
 
     /**
-     * Builder of {@link SectionParameters}
+     * Builder static factory method with mandatory parameters of {@link Section} (namely none).
+     */
+    public static Builder builder() {
+        return new Builder();
+    }
+
+    /**
+     * Builder of {@link SectionParameters}.
      */
     public static class Builder {
-        private final int itemResourceId;
+        @LayoutRes
+        private Integer itemResourceId;
+        @LayoutRes
+        private Integer headerResourceId;
+        @LayoutRes
+        private Integer footerResourceId;
+        @LayoutRes
+        private Integer loadingResourceId;
+        @LayoutRes
+        private Integer failedResourceId;
+        @LayoutRes
+        private Integer emptyResourceId;
+        private boolean itemViewWillBeProvided;
+        private boolean headerViewWillBeProvided;
+        private boolean footerViewWillBeProvided;
+        private boolean loadingViewWillBeProvided;
+        private boolean failedViewWillBeProvided;
+        private boolean emptyViewWillBeProvided;
 
-        @LayoutRes private Integer headerResourceId;
-        @LayoutRes private Integer footerResourceId;
-        @LayoutRes private Integer loadingResourceId;
-        @LayoutRes private Integer failedResourceId;
-        @LayoutRes private Integer emptyResourceId;
+        /**
+         * Constructor with mandatory parameters of {@link Section} (namely none).
+         */
+        private Builder() {
+        }
 
         /**
-         * Constructor with mandatory parameters of {@link Section}
+         * Constructor with optional parameter for backward compatibility purposes.
+         *
          * @param itemResourceId layout resource for Section's items
+         *
+         * @deprecated Use {@link #SectionParameters#builder} instead.
          */
+        @Deprecated
         public Builder(@LayoutRes int itemResourceId) {
             this.itemResourceId = itemResourceId;
         }
 
         /**
-         * Set layout resource for Section's header
+         * Set layout resource for Section's items.
+         *
+         * @param itemResourceId layout resource for Section's items
+         * @return this builder
+         */
+        public Builder itemResourceId(@LayoutRes int itemResourceId) {
+            this.itemResourceId = itemResourceId;
+
+            return this;
+        }
+
+        /**
+         * Declare that there will be no {@link #itemResourceId}, as the view will be provided by
+         * the Section's implementation directly.
+         *
+         * @return this builder
+         */
+        public Builder itemViewWillBeProvided() {
+            itemViewWillBeProvided = true;
+
+            return this;
+        }
+
+        /**
+         * Set layout resource for Section's header.
+         *
          * @param headerResourceId layout resource for Section's header
          * @return this builder
          */
@@ -45,7 +154,20 @@ public Builder headerResourceId(@LayoutRes int headerResourceId) {
         }
 
         /**
-         * Set layout resource for Section's footer
+         * Declare that there will be no {@link #headerResourceId}, as the view will be provided by
+         * the Section's implementation directly.
+         *
+         * @return this builder
+         */
+        public Builder headerViewWillBeProvided() {
+            headerViewWillBeProvided = true;
+
+            return this;
+        }
+
+        /**
+         * Set layout resource for Section's footer.
+         *
          * @param footerResourceId layout resource for Section's footer
          * @return this builder
          */
@@ -56,7 +178,20 @@ public Builder footerResourceId(@LayoutRes int footerResourceId) {
         }
 
         /**
-         * Set layout resource for Section's loading state
+         * Declare that there will be no {@link #footerResourceId}, as the view will be provided by
+         * the Section's implementation directly.
+         *
+         * @return this builder
+         */
+        public Builder footerViewWillBeProvided() {
+            footerViewWillBeProvided = true;
+
+            return this;
+        }
+
+        /**
+         * Set layout resource for Section's loading state.
+         *
          * @param loadingResourceId layout resource for Section's loading state
          * @return this builder
          */
@@ -67,7 +202,20 @@ public Builder loadingResourceId(@LayoutRes int loadingResourceId) {
         }
 
         /**
-         * Set layout resource for Section's failed state
+         * Declare that there will be no {@link #loadingResourceId}, as the view will be provided by
+         * the Section's implementation directly.
+         *
+         * @return this builder
+         */
+        public Builder loadingViewWillBeProvided() {
+            loadingViewWillBeProvided = true;
+
+            return this;
+        }
+
+        /**
+         * Set layout resource for Section's failed state.
+         *
          * @param failedResourceId layout resource for Section's failed state
          * @return this builder
          */
@@ -78,7 +226,20 @@ public Builder failedResourceId(@LayoutRes int failedResourceId) {
         }
 
         /**
-         * Set layout resource for Section's empty state
+         * Declare that there will be no {@link #failedResourceId}, as the view will be provided by
+         * the Section's implementation directly.
+         *
+         * @return this builder
+         */
+        public Builder failedViewWillBeProvided() {
+            failedViewWillBeProvided = true;
+
+            return this;
+        }
+
+        /**
+         * Set layout resource for Section's empty state.
+         *
          * @param emptyResourceId layout resource for Section's empty state
          * @return this builder
          */
@@ -87,22 +248,26 @@ public Builder emptyResourceId(@LayoutRes int emptyResourceId) {
 
             return this;
         }
-        
+
         /**
-         * Build an instance of SectionParameters
+         * Declare that there will be no {@link #emptyResourceId}, as the view will be provided by
+         * the Section's implementation directly.
+         *
+         * @return this builder
+         */
+        public Builder emptyViewWillBeProvided() {
+            emptyViewWillBeProvided = true;
+
+            return this;
+        }
+
+        /**
+         * Build an instance of SectionParameters.
+         *
          * @return an instance of SectionParameters
          */
         public SectionParameters build() {
             return new SectionParameters(this);
         }
     }
-
-    private SectionParameters(Builder builder) {
-        this.headerResourceId = builder.headerResourceId;
-        this.footerResourceId = builder.footerResourceId;
-        this.itemResourceId = builder.itemResourceId;
-        this.loadingResourceId = builder.loadingResourceId;
-        this.failedResourceId = builder.failedResourceId;
-        this.emptyResourceId = builder.emptyResourceId;
-    }
 }
diff --git a/library/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/SectionedRecyclerViewAdapter.java b/library/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/SectionedRecyclerViewAdapter.java
index ea99434..eb08bca 100644
--- a/library/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/SectionedRecyclerViewAdapter.java
+++ b/library/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/SectionedRecyclerViewAdapter.java
@@ -1,5 +1,6 @@
 package io.github.luizgrp.sectionedrecyclerviewadapter;
 
+import android.support.annotation.LayoutRes;
 import android.support.annotation.NonNull;
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.widget.RecyclerView;
@@ -7,33 +8,35 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.UUID;
+
 import static io.github.luizgrp.sectionedrecyclerviewadapter.Section.State;
 
 /**
  * A custom RecyclerView Adapter that allows {@link Section Sections} to be added to it.
  * Sections are displayed in the same order they were added.
  */
+@SuppressWarnings({"WeakerAccess", "SameParameterValue", "PMD.CollapsibleIfStatements"})
 public class SectionedRecyclerViewAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
-    public final static int VIEW_TYPE_HEADER = 0;
-    public final static int VIEW_TYPE_FOOTER = 1;
-    public final static int VIEW_TYPE_ITEM_LOADED = 2;
-    public final static int VIEW_TYPE_LOADING = 3;
-    public final static int VIEW_TYPE_FAILED = 4;
-    public final static int VIEW_TYPE_EMPTY = 5;
+    public static final int VIEW_TYPE_HEADER = 0;
+    public static final int VIEW_TYPE_FOOTER = 1;
+    public static final int VIEW_TYPE_ITEM_LOADED = 2;
+    public static final int VIEW_TYPE_LOADING = 3;
+    public static final int VIEW_TYPE_FAILED = 4;
+    public static final int VIEW_TYPE_EMPTY = 5;
+
+    private final Map<String, Section> sections;
+    private final Map<String, Integer> sectionViewTypeNumbers;
 
-    private LinkedHashMap<String, Section> sections;
-    private HashMap<String, Integer> sectionViewTypeNumbers;
     private int viewTypeCount = 0;
-    private final static int VIEW_TYPE_QTY = 6;
+    private static final int VIEW_TYPE_QTY = 6;
 
     public SectionedRecyclerViewAdapter() {
         sections = new LinkedHashMap<>();
-        sectionViewTypeNumbers = new HashMap<>();
+        sectionViewTypeNumbers = new LinkedHashMap<>();
     }
 
     @Override
@@ -47,30 +50,24 @@ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType
                 int sectionViewType = viewType - entry.getValue();
 
                 switch (sectionViewType) {
-                    case VIEW_TYPE_HEADER: {
+                    case VIEW_TYPE_HEADER:
                         viewHolder = getHeaderViewHolder(parent, section);
                         break;
-                    }
-                    case VIEW_TYPE_FOOTER: {
+                    case VIEW_TYPE_FOOTER:
                         viewHolder = getFooterViewHolder(parent, section);
                         break;
-                    }
-                    case VIEW_TYPE_ITEM_LOADED: {
+                    case VIEW_TYPE_ITEM_LOADED:
                         viewHolder = getItemViewHolder(parent, section);
                         break;
-                    }
-                    case VIEW_TYPE_LOADING: {
+                    case VIEW_TYPE_LOADING:
                         viewHolder = getLoadingViewHolder(parent, section);
                         break;
-                    }
-                    case VIEW_TYPE_FAILED: {
+                    case VIEW_TYPE_FAILED:
                         viewHolder = getFailedViewHolder(parent, section);
                         break;
-                    }
-                    case VIEW_TYPE_EMPTY: {
+                    case VIEW_TYPE_EMPTY:
                         viewHolder = getEmptyViewHolder(parent, section);
                         break;
-                    }
                     default:
                         throw new IllegalArgumentException("Invalid viewType");
                 }
@@ -80,69 +77,117 @@ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType
         return viewHolder;
     }
 
+    @VisibleForTesting
+    View inflate(@LayoutRes int layoutResourceId, ViewGroup parent) {
+        return LayoutInflater.from(parent.getContext()).inflate(layoutResourceId, parent, false);
+    }
+
     private RecyclerView.ViewHolder getItemViewHolder(ViewGroup parent, Section section) {
-        View view = LayoutInflater.from(parent.getContext()).inflate(section.getItemResourceId(),
-                parent, false);
-        // get the item viewholder from the section
+        View view;
+        if (section.isItemViewWillBeProvided()) {
+            view = section.getItemView(parent);
+            if (view == null) {
+                throw new NullPointerException("Section.getItemView() returned null");
+            }
+        } else {
+            Integer resId = section.getItemResourceId();
+            if (resId == null) {
+                throw new NullPointerException("Missing 'item' resource id");
+            }
+            view = inflate(resId, parent);
+        }
         return section.getItemViewHolder(view);
     }
 
     private RecyclerView.ViewHolder getHeaderViewHolder(ViewGroup parent, Section section) {
-        Integer resId = section.getHeaderResourceId();
-
-        if (resId == null)
-            throw new NullPointerException("Missing 'header' resource id");
-
-        View view = LayoutInflater.from(parent.getContext()).inflate(resId, parent, false);
-        // get the header viewholder from the section
+        View view;
+        if (section.isHeaderViewWillBeProvided()) {
+            view = section.getHeaderView(parent);
+            if (view == null) {
+                throw new NullPointerException("Section.getHeaderView() returned null");
+            }
+        } else {
+            Integer resId = section.getHeaderResourceId();
+            if (resId == null) {
+                throw new NullPointerException("Missing 'header' resource id");
+            }
+            view = inflate(resId, parent);
+        }
         return section.getHeaderViewHolder(view);
     }
 
     private RecyclerView.ViewHolder getFooterViewHolder(ViewGroup parent, Section section) {
-        Integer resId = section.getFooterResourceId();
-
-        if (resId == null)
-            throw new NullPointerException("Missing 'footer' resource id");
-
-        View view = LayoutInflater.from(parent.getContext()).inflate(resId, parent, false);
-        // get the footer viewholder from the section
+        View view;
+        if (section.isFooterViewWillBeProvided()) {
+            view = section.getFooterView(parent);
+            if (view == null) {
+                throw new NullPointerException("Section.getFooterView() returned null");
+            }
+        } else {
+            Integer resId = section.getFooterResourceId();
+            if (resId == null) {
+                throw new NullPointerException("Missing 'footer' resource id");
+            }
+            view = inflate(resId, parent);
+        }
         return section.getFooterViewHolder(view);
     }
 
     private RecyclerView.ViewHolder getLoadingViewHolder(ViewGroup parent, Section section) {
-        Integer resId = section.getLoadingResourceId();
-
-        if (resId == null) throw new NullPointerException("Missing 'loading state' resource id");
-
-        View view = LayoutInflater.from(parent.getContext()).inflate(resId, parent, false);
-        // get the loading viewholder from the section
+        View view;
+        if (section.isLoadingViewWillBeProvided()) {
+            view = section.getLoadingView(parent);
+            if (view == null) {
+                throw new NullPointerException("Section.getLoadingView() returned null");
+            }
+        } else {
+            Integer resId = section.getLoadingResourceId();
+            if (resId == null) {
+                throw new NullPointerException("Missing 'loading' resource id");
+            }
+            view = inflate(resId, parent);
+        }
         return section.getLoadingViewHolder(view);
     }
 
     private RecyclerView.ViewHolder getFailedViewHolder(ViewGroup parent, Section section) {
-        Integer resId = section.getFailedResourceId();
-
-        if (resId == null) throw new NullPointerException("Missing 'failed state' resource id");
-
-        View view = LayoutInflater.from(parent.getContext()).inflate(resId, parent, false);
-        // get the failed load viewholder from the section
+        View view;
+        if (section.isFailedViewWillBeProvided()) {
+            view = section.getFailedView(parent);
+            if (view == null) {
+                throw new NullPointerException("Section.getFailedView() returned null");
+            }
+        } else {
+            Integer resId = section.getFailedResourceId();
+            if (resId == null) {
+                throw new NullPointerException("Missing 'failed' resource id");
+            }
+            view = inflate(resId, parent);
+        }
         return section.getFailedViewHolder(view);
     }
 
     private RecyclerView.ViewHolder getEmptyViewHolder(ViewGroup parent, Section section) {
-        Integer resId = section.getEmptyResourceId();
-
-        if (resId == null) throw new NullPointerException("Missing 'empty state' resource id");
-
-        View view = LayoutInflater.from(parent.getContext()).inflate(resId, parent, false);
-        // get the empty load viewholder from the section
+        View view;
+        if (section.isEmptyViewWillBeProvided()) {
+            view = section.getEmptyView(parent);
+            if (view == null) {
+                throw new NullPointerException("Section.getEmptyView() returned null");
+            }
+        } else {
+            Integer resId = section.getEmptyResourceId();
+            if (resId == null) {
+                throw new NullPointerException("Missing 'empty' resource id");
+            }
+            view = inflate(resId, parent);
+        }
         return section.getEmptyViewHolder(view);
     }
 
     /**
      * Add a section to this recyclerview.
      *
-     * @param tag unique identifier of the section
+     * @param tag     unique identifier of the section
      * @param section section to be added
      */
     public void addSection(String tag, Section section) {
@@ -152,7 +197,7 @@ public void addSection(String tag, Section section) {
     }
 
     /**
-     * Add a section to this recyclerview with a random tag;
+     * Add a section to this recyclerview with a random tag.
      *
      * @param section section to be added
      * @return generated tag
@@ -175,6 +220,24 @@ public Section getSection(String tag) {
         return this.sections.get(tag);
     }
 
+    /**
+     * Remove section from this recyclerview.
+     *
+     * @param section section to be removed
+     */
+    public void removeSection(Section section) {
+        String tag = null;
+        for (final Map.Entry<String, Section> entry : this.sections.entrySet()) {
+            if (entry.getValue() == section) {
+                tag = entry.getKey();
+            }
+        }
+
+        if (tag != null) {
+            this.removeSection(tag);
+        }
+    }
+
     /**
      * Remove section from this recyclerview.
      *
@@ -182,6 +245,7 @@ public Section getSection(String tag) {
      */
     public void removeSection(String tag) {
         this.sections.remove(tag);
+        this.sectionViewTypeNumbers.remove(tag);
     }
 
     /**
@@ -200,7 +264,9 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
             Section section = entry.getValue();
 
             // ignore invisible sections
-            if (!section.isVisible()) continue;
+            if (!section.isVisible()) {
+                continue;
+            }
 
             int sectionTotal = section.getSectionItemsTotal();
 
@@ -224,8 +290,7 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
                 }
 
                 // delegate the binding to the section content
-                getSectionForPosition(position).onBindContentViewHolder(holder,
-                        getPositionInSection(position));
+                getSectionForPosition(position).onBindContentViewHolder(holder, getPositionInSection(position));
                 return;
             }
 
@@ -243,7 +308,9 @@ public int getItemCount() {
             Section section = entry.getValue();
 
             // ignore invisible sections
-            if (!section.isVisible()) continue;
+            if (!section.isVisible()) {
+                continue;
+            }
 
             count += section.getSectionItemsTotal();
         }
@@ -268,7 +335,9 @@ public int getItemViewType(int position) {
             Section section = entry.getValue();
 
             // ignore invisible sections
-            if (!section.isVisible()) continue;
+            if (!section.isVisible()) {
+                continue;
+            }
 
             int sectionTotal = section.getSectionItemsTotal();
 
@@ -301,7 +370,6 @@ public int getItemViewType(int position) {
                     default:
                         throw new IllegalStateException("Invalid state");
                 }
-
             }
 
             currentPos += sectionTotal;
@@ -311,18 +379,18 @@ public int getItemViewType(int position) {
     }
 
     /**
-     * Returns the Section ViewType of an item based on the position in the adapter:
-     *
-     * - SectionedRecyclerViewAdapter.VIEW_TYPE_HEADER
-     * - SectionedRecyclerViewAdapter.VIEW_TYPE_FOOTER
-     * - SectionedRecyclerViewAdapter.VIEW_TYPE_ITEM_LOADED
-     * - SectionedRecyclerViewAdapter.VIEW_TYPE_LOADING
-     * - SectionedRecyclerViewAdapter.VIEW_TYPE_FAILED
-     * - SectionedRecyclerViewAdapter.VIEW_TYPE_EMPTY
+     * Returns the Section ViewType of an item based on the position in the adapter.
      *
      * @param position position in the adapter
-     * @return SectionedRecyclerViewAdapter.VIEW_TYPE_HEADER, VIEW_TYPE_FOOTER,
-     * VIEW_TYPE_ITEM_LOADED, VIEW_TYPE_LOADING, VIEW_TYPE_FAILED or VIEW_TYPE_EMPTY
+     * @return one of the view types:
+     * <ul>
+     * <li>SectionedRecyclerViewAdapter.VIEW_TYPE_HEADER</li>
+     * <li>SectionedRecyclerViewAdapter.VIEW_TYPE_FOOTER</li>
+     * <li>SectionedRecyclerViewAdapter.VIEW_TYPE_ITEM_LOADED</li>
+     * <li>SectionedRecyclerViewAdapter.VIEW_TYPE_LOADING</li>
+     * <li>SectionedRecyclerViewAdapter.VIEW_TYPE_FAILED</li>
+     * <li>SectionedRecyclerViewAdapter.VIEW_TYPE_EMPTY</li>
+     * </ul>
      */
     public int getSectionItemViewType(int position) {
         int viewType = getItemViewType(position);
@@ -344,7 +412,9 @@ public Section getSectionForPosition(int position) {
             Section section = entry.getValue();
 
             // ignore invisible sections
-            if (!section.isVisible()) continue;
+            if (!section.isVisible()) {
+                continue;
+            }
 
             int sectionTotal = section.getSectionItemsTotal();
 
@@ -380,7 +450,9 @@ public int getPositionInSection(int position) {
             Section section = entry.getValue();
 
             // ignore invisible sections
-            if (!section.isVisible()) continue;
+            if (!section.isVisible()) {
+                continue;
+            }
 
             int sectionTotal = section.getSectionItemsTotal();
 
@@ -407,7 +479,6 @@ public int getSectionPosition(String tag) {
         return getSectionPosition(section);
     }
 
-
     /**
      * Return the section position in the adapter.
      *
@@ -421,7 +492,9 @@ public int getSectionPosition(Section section) {
             Section loopSection = entry.getValue();
 
             // ignore invisible sections
-            if (!loopSection.isVisible()) continue;
+            if (!loopSection.isVisible()) {
+                continue;
+            }
 
             if (loopSection == section) {
                 return currentPos;
@@ -436,19 +509,24 @@ public int getSectionPosition(Section section) {
     }
 
     /**
-     * Return a map with all sections of this adapter.
+     * Return a copy of the map with all sections of this adapter.
      *
-     * @return a map with all sections
+     * @return a copy of the map with all sections
      */
-    public LinkedHashMap<String, Section> getSectionsMap() {
-        return sections;
+    @NonNull
+    public Map<String, Section> getCopyOfSectionsMap() {
+        Map<String, Section> copyOfSections;
+        synchronized (sections) {
+            copyOfSections = new LinkedHashMap<>(sections);
+        }
+        return copyOfSections;
     }
 
     /**
      * Helper method that receives position in relation to the section, and returns the position in
      * the adapter.
      *
-     * @param tag unique identifier of the section
+     * @param tag      unique identifier of the section
      * @param position position of the item in the section
      * @return position of the item in the adapter
      */
@@ -462,12 +540,12 @@ public int getPositionInAdapter(String tag, int position) {
      * Helper method that receives position in relation to the section, and returns the position in
      * the adapter.
      *
-     * @param section a visible section of this adapter
+     * @param section  a visible section of this adapter
      * @param position position of the item in the section
      * @return position of the item in the adapter
      */
     public int getPositionInAdapter(Section section, int position) {
-        return getSectionPosition(section) + (section.hasHeader ? 1 : 0) + position;
+        return getSectionPosition(section) + (section.hasHeader() ? 1 : 0) + position;
     }
 
     /**
@@ -489,7 +567,7 @@ public int getHeaderPositionInAdapter(String tag) {
      * @return position of the header in the adapter
      */
     public int getHeaderPositionInAdapter(Section section) {
-        if (!section.hasHeader) {
+        if (!section.hasHeader()) {
             throw new IllegalStateException("Section doesn't have a header");
         }
 
@@ -515,7 +593,7 @@ public int getFooterPositionInAdapter(String tag) {
      * @return position of the footer in the adapter
      */
     public int getFooterPositionInAdapter(Section section) {
-        if (!section.hasFooter) {
+        if (!section.hasFooter()) {
             throw new IllegalStateException("Section doesn't have a footer");
         }
 
@@ -526,7 +604,7 @@ public int getFooterPositionInAdapter(Section section) {
      * Helper method that receives position in relation to the section, calculates the relative
      * position in the adapter and calls {@link #notifyItemInserted}.
      *
-     * @param tag unique identifier of the section
+     * @param tag      unique identifier of the section
      * @param position position of the item in the section
      */
     public void notifyItemInsertedInSection(String tag, int position) {
@@ -537,7 +615,7 @@ public void notifyItemInsertedInSection(String tag, int position) {
      * Helper method that receives position in relation to the section, calculates the relative
      * position in the adapter and calls {@link #notifyItemInserted}.
      *
-     * @param section a visible section of this adapter
+     * @param section  a visible section of this adapter
      * @param position position of the item in the section
      */
     public void notifyItemInsertedInSection(Section section, int position) {
@@ -553,9 +631,9 @@ void callSuperNotifyItemInserted(int position) {
      * Helper method that receives position in relation to the section, calculates the relative
      * position in the adapter and calls {@link #notifyItemRangeInserted}.
      *
-     * @param tag unique identifier of the section
+     * @param tag           unique identifier of the section
      * @param positionStart position of the first item that was inserted in the section
-     * @param itemCount number of items inserted in the section
+     * @param itemCount     number of items inserted in the section
      */
     public void notifyItemRangeInsertedInSection(String tag, int positionStart, int itemCount) {
         callSuperNotifyItemRangeInserted(getPositionInAdapter(tag, positionStart), itemCount);
@@ -565,9 +643,9 @@ public void notifyItemRangeInsertedInSection(String tag, int positionStart, int
      * Helper method that receives position in relation to the section, calculates the relative
      * position in the adapter and calls {@link #notifyItemRangeInserted}.
      *
-     * @param section a visible section of this adapter
+     * @param section       a visible section of this adapter
      * @param positionStart position of the first item that was inserted in the section
-     * @param itemCount number of items inserted in the section
+     * @param itemCount     number of items inserted in the section
      */
     public void notifyItemRangeInsertedInSection(Section section, int positionStart, int itemCount) {
         callSuperNotifyItemRangeInserted(getPositionInAdapter(section, positionStart), itemCount);
@@ -582,7 +660,7 @@ void callSuperNotifyItemRangeInserted(int positionStart, int itemCount) {
      * Helper method that receives position in relation to the section, calculates the relative
      * position in the adapter and calls {@link #notifyItemRemoved}.
      *
-     * @param tag unique identifier of the section
+     * @param tag      unique identifier of the section
      * @param position position of the item in the section
      */
     public void notifyItemRemovedFromSection(String tag, int position) {
@@ -593,7 +671,7 @@ public void notifyItemRemovedFromSection(String tag, int position) {
      * Helper method that receives position in relation to the section, calculates the relative
      * position in the adapter and calls {@link #notifyItemRemoved}.
      *
-     * @param section a visible section of this adapter
+     * @param section  a visible section of this adapter
      * @param position position of the item in the section
      */
     public void notifyItemRemovedFromSection(Section section, int position) {
@@ -609,9 +687,9 @@ void callSuperNotifyItemRemoved(int position) {
      * Helper method that receives position in relation to the section, calculates the relative
      * position in the adapter and calls {@link #notifyItemRangeRemoved}.
      *
-     * @param tag unique identifier of the section
+     * @param tag           unique identifier of the section
      * @param positionStart previous position of the first item that was removed from the section
-     * @param itemCount number of items removed from the section
+     * @param itemCount     number of items removed from the section
      */
     public void notifyItemRangeRemovedFromSection(String tag, int positionStart, int itemCount) {
         callSuperNotifyItemRangeRemoved(getPositionInAdapter(tag, positionStart), itemCount);
@@ -621,9 +699,9 @@ public void notifyItemRangeRemovedFromSection(String tag, int positionStart, int
      * Helper method that receives position in relation to the section, calculates the relative
      * position in the adapter and calls {@link #notifyItemRangeRemoved}.
      *
-     * @param section a visible section of this adapter
+     * @param section       a visible section of this adapter
      * @param positionStart previous position of the first item that was removed from the section
-     * @param itemCount number of items removed from the section
+     * @param itemCount     number of items removed from the section
      */
     public void notifyItemRangeRemovedFromSection(Section section, int positionStart, int itemCount) {
         callSuperNotifyItemRangeRemoved(getPositionInAdapter(section, positionStart), itemCount);
@@ -638,7 +716,7 @@ void callSuperNotifyItemRangeRemoved(int positionStart, int itemCount) {
      * Helper method that receives position in relation to the section, calculates the relative
      * position in the adapter and calls {@link #notifyItemChanged}.
      *
-     * @param tag unique identifier of the section
+     * @param tag      unique identifier of the section
      * @param position position of the item in the section
      */
     public void notifyItemChangedInSection(String tag, int position) {
@@ -649,7 +727,7 @@ public void notifyItemChangedInSection(String tag, int position) {
      * Helper method that receives position in relation to the section, calculates the relative
      * position in the adapter and calls {@link #notifyItemChanged}.
      *
-     * @param section a visible section of this adapter
+     * @param section  a visible section of this adapter
      * @param position position of the item in the section
      */
     public void notifyItemChangedInSection(Section section, int position) {
@@ -705,9 +783,9 @@ void callSuperNotifyItemChanged(int position) {
      * Helper method that receives position in relation to the section, calculates the relative
      * position in the adapter and calls {@link #notifyItemRangeChanged}.
      *
-     * @param tag unique identifier of the section
+     * @param tag           unique identifier of the section
      * @param positionStart position of the first item that was changed in the section
-     * @param itemCount number of items changed in the section
+     * @param itemCount     number of items changed in the section
      */
     public void notifyItemRangeChangedInSection(String tag, int positionStart, int itemCount) {
         callSuperNotifyItemRangeChanged(getPositionInAdapter(tag, positionStart), itemCount);
@@ -717,9 +795,9 @@ public void notifyItemRangeChangedInSection(String tag, int positionStart, int i
      * Helper method that receives position in relation to the section, calculates the relative
      * position in the adapter and calls {@link #notifyItemRangeChanged}.
      *
-     * @param section a visible section of this adapter
+     * @param section       a visible section of this adapter
      * @param positionStart position of the first item that was changed in the section
-     * @param itemCount number of items changed in the section
+     * @param itemCount     number of items changed in the section
      */
     public void notifyItemRangeChangedInSection(Section section, int positionStart, int itemCount) {
         callSuperNotifyItemRangeChanged(getPositionInAdapter(section, positionStart), itemCount);
@@ -734,10 +812,10 @@ void callSuperNotifyItemRangeChanged(int positionStart, int itemCount) {
      * Helper method that receives position in relation to the section, calculates the relative
      * position in the adapter and calls {@link #notifyItemRangeChanged}.
      *
-     * @param tag unique identifier of the section
+     * @param tag           unique identifier of the section
      * @param positionStart position of the first item that was inserted in the section
-     * @param itemCount number of items inserted in the section
-     * @param payload optional parameter, use null to identify a "full" update
+     * @param itemCount     number of items inserted in the section
+     * @param payload       optional parameter, use null to identify a "full" update
      */
     public void notifyItemRangeChangedInSection(String tag, int positionStart, int itemCount,
                                                 Object payload) {
@@ -748,10 +826,10 @@ public void notifyItemRangeChangedInSection(String tag, int positionStart, int i
      * Helper method that receives position in relation to the section, calculates the relative
      * position in the adapter and calls {@link #notifyItemRangeChanged}.
      *
-     * @param section a visible section of this adapter
+     * @param section       a visible section of this adapter
      * @param positionStart position of the first item that was inserted in the section
-     * @param itemCount number of items inserted in the section
-     * @param payload optional parameter, use null to identify a "full" update
+     * @param itemCount     number of items inserted in the section
+     * @param payload       optional parameter, use null to identify a "full" update
      */
     public void notifyItemRangeChangedInSection(Section section, int positionStart, int itemCount,
                                                 Object payload) {
@@ -767,26 +845,24 @@ void callSuperNotifyItemRangeChanged(int positionStart, int itemCount, Object pa
      * Helper method that receives position in relation to the section, calculates the relative
      * position in the adapter and calls {@link #notifyItemMoved}.
      *
-     * @param tag unique identifier of the section
+     * @param tag          unique identifier of the section
      * @param fromPosition previous position of the item in the section
-     * @param toPosition new position of the item in the section
+     * @param toPosition   new position of the item in the section
      */
     public void notifyItemMovedInSection(String tag, int fromPosition, int toPosition) {
-        callSuperNotifyItemMoved(getPositionInAdapter(tag, fromPosition),
-                getPositionInAdapter(tag, toPosition));
+        callSuperNotifyItemMoved(getPositionInAdapter(tag, fromPosition), getPositionInAdapter(tag, toPosition));
     }
 
     /**
      * Helper method that receives position in relation to the section, calculates the relative
      * position in the adapter and calls {@link #notifyItemMoved}.
      *
-     * @param section a visible section of this adapter
+     * @param section      a visible section of this adapter
      * @param fromPosition previous position of the item in the section
-     * @param toPosition new position of the item in the section
+     * @param toPosition   new position of the item in the section
      */
     public void notifyItemMovedInSection(Section section, int fromPosition, int toPosition) {
-        callSuperNotifyItemMoved(getPositionInAdapter(section, fromPosition),
-                getPositionInAdapter(section, toPosition));
+        callSuperNotifyItemMoved(getPositionInAdapter(section, fromPosition), getPositionInAdapter(section, toPosition));
     }
 
     @VisibleForTesting
@@ -799,7 +875,7 @@ void callSuperNotifyItemMoved(int fromPosition, int toPosition) {
      * view holder in the adapter. Useful to be called after changing the State from
      * LOADING/FAILED/EMPTY to LOADING/FAILED/EMPTY.
      *
-     * @param tag unique identifier of the section
+     * @param tag           unique identifier of the section
      * @param previousState previous state of section
      */
     public void notifyNotLoadedStateChanged(String tag, State previousState) {
@@ -813,7 +889,7 @@ public void notifyNotLoadedStateChanged(String tag, State previousState) {
      * view holder in the adapter. Useful to be called after changing the State from
      * LOADING/ FAILED/ EMPTY to LOADING/ FAILED/ EMPTY.
      *
-     * @param section a visible section of this adapter
+     * @param section       a visible section of this adapter
      * @param previousState previous state of section
      */
     public void notifyNotLoadedStateChanged(Section section, State previousState) {
@@ -839,7 +915,7 @@ public void notifyNotLoadedStateChanged(Section section, State previousState) {
      * the position of the {@link State} view holder in the adapter. Useful to be called after
      * changing the State from LOADING/ FAILED/ EMPTY to LOADED.
      *
-     * @param tag unique identifier of the section
+     * @param tag           unique identifier of the section
      * @param previousState previous state of section
      */
     public void notifyStateChangedToLoaded(String tag, State previousState) {
@@ -853,7 +929,7 @@ public void notifyStateChangedToLoaded(String tag, State previousState) {
      * the position of the {@link State} view holder in the adapter. Useful to be called after
      * changing the State from LOADING/ FAILED/ EMPTY to LOADED.
      *
-     * @param section a visible section of this adapter
+     * @param section       a visible section of this adapter
      * @param previousState previous state of section
      */
     public void notifyStateChangedToLoaded(Section section, State previousState) {
@@ -889,7 +965,7 @@ public void notifyStateChangedToLoaded(Section section, State previousState) {
      * the position of the {@link State} view holder in the adapter. Useful to be called after
      * changing the State from LOADED to LOADING/ FAILED/ EMPTY.
      *
-     * @param tag unique identifier of the section
+     * @param tag                       unique identifier of the section
      * @param previousContentItemsCount previous content items count of section
      */
     public void notifyStateChangedFromLoaded(String tag, int previousContentItemsCount) {
@@ -903,7 +979,7 @@ public void notifyStateChangedFromLoaded(String tag, int previousContentItemsCou
      * the position of the {@link State} view holder in the adapter. Useful to be called after
      * changing the State from LOADED to LOADING/ FAILED/ EMPTY.
      *
-     * @param section a visible section of this adapter
+     * @param section                   a visible section of this adapter
      * @param previousContentItemsCount previous content items count of section
      */
     public void notifyStateChangedFromLoaded(Section section, int previousContentItemsCount) {
@@ -1065,7 +1141,7 @@ public void notifySectionChangedToVisible(Section section) {
      * in the adapter. Useful to be called after changing the visibility of the section to invisible
      * with {@link Section#setVisible}.
      *
-     * @param tag unique identifier of the section
+     * @param tag                     unique identifier of the section
      * @param previousSectionPosition previous section position
      */
     public void notifySectionChangedToInvisible(String tag, int previousSectionPosition) {
@@ -1079,7 +1155,7 @@ public void notifySectionChangedToInvisible(String tag, int previousSectionPosit
      * in the adapter. Useful to be called after changing the visibility of the section to invisible
      * with {@link Section#setVisible}.
      *
-     * @param section an invisible section of this adapter
+     * @param section                 an invisible section of this adapter
      * @param previousSectionPosition previous section position
      */
     public void notifySectionChangedToInvisible(Section section, int previousSectionPosition) {
diff --git a/library/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/StatelessSection.java b/library/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/StatelessSection.java
index b7e35a2..04e8270 100644
--- a/library/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/StatelessSection.java
+++ b/library/src/main/java/io/github/luizgrp/sectionedrecyclerviewadapter/StatelessSection.java
@@ -1,6 +1,5 @@
 package io.github.luizgrp.sectionedrecyclerviewadapter;
 
-import android.support.annotation.LayoutRes;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
@@ -10,53 +9,8 @@
 public abstract class StatelessSection extends Section {
 
     /**
-     * Create a stateless Section object without header and footer
+     * Create a stateless Section object based on {@link SectionParameters}.
      *
-     * @deprecated Replaced by {@link #StatelessSection(SectionParameters)}
-     *
-     * @param itemResourceId layout resource for its items
-     */
-    @Deprecated
-    public StatelessSection(@LayoutRes int itemResourceId) {
-        this(new SectionParameters.Builder(itemResourceId)
-                .build());
-    }
-
-    /**
-     * Create a stateless Section object, with a custom header but without footer
-     *
-     * @deprecated Replaced by {@link #StatelessSection(SectionParameters)}
-     *
-     * @param headerResourceId layout resource for its header
-     * @param itemResourceId layout resource for its items
-     */
-    @Deprecated
-    public StatelessSection(@LayoutRes int headerResourceId, @LayoutRes int itemResourceId) {
-        this(new SectionParameters.Builder(itemResourceId)
-                .headerResourceId(headerResourceId)
-                .build());
-    }
-
-    /**
-     * Create a stateless Section object, with a custom header and a custom footer
-     *
-     * @deprecated Replaced by {@link #StatelessSection(SectionParameters)}
-     *
-     * @param headerResourceId layout resource for its header
-     * @param footerResourceId layout resource for its footer
-     * @param itemResourceId layout resource for its items
-     */
-    @Deprecated
-    public StatelessSection(@LayoutRes int headerResourceId, @LayoutRes int footerResourceId,
-                            @LayoutRes int itemResourceId) {
-        this(new SectionParameters.Builder(itemResourceId)
-                .headerResourceId(headerResourceId)
-                .footerResourceId(footerResourceId)
-                .build());
-    }
-
-    /**
-     * Create a stateless Section object based on {@link SectionParameters}
      * @param sectionParameters section parameters
      */
     public StatelessSection(SectionParameters sectionParameters) {
@@ -66,15 +20,29 @@ public StatelessSection(SectionParameters sectionParameters) {
             throw new IllegalArgumentException("Stateless section shouldn't have a loading state resource");
         }
 
+        if (sectionParameters.loadingViewWillBeProvided) {
+            throw new IllegalArgumentException("Stateless section shouldn't have loadingViewWillBeProvided set");
+        }
+
         if (sectionParameters.failedResourceId != null) {
             throw new IllegalArgumentException("Stateless section shouldn't have a failed state resource");
         }
 
+        if (sectionParameters.failedViewWillBeProvided) {
+            throw new IllegalArgumentException("Stateless section shouldn't have failedViewWillBeProvided set");
+        }
+
         if (sectionParameters.emptyResourceId != null) {
             throw new IllegalArgumentException("Stateless section shouldn't have an empty state resource");
         }
+
+        if (sectionParameters.emptyViewWillBeProvided) {
+            throw new IllegalArgumentException("Stateless section shouldn't have emptyViewWillBeProvided set");
+        }
     }
 
+    // Override these methods to make them final.
+
     @Override
     public final void onBindLoadingViewHolder(RecyclerView.ViewHolder holder) {
         super.onBindLoadingViewHolder(holder);
diff --git a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/SectionBindingTest.java b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/SectionBindingTest.java
new file mode 100644
index 0000000..6a36f03
--- /dev/null
+++ b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/SectionBindingTest.java
@@ -0,0 +1,490 @@
+package io.github.luizgrp.sectionedrecyclerviewadapter;
+
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.mockito.ArgumentMatcher;
+import org.mockito.MockitoAnnotations;
+import org.mockito.Spy;
+
+import static io.github.luizgrp.sectionedrecyclerviewadapter.Section.State;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+/*
+ * Unit tests for SectionedRecyclerViewAdapter, testing specifically whether the right get*View(), get*ViewHolder() and
+ * onBind*ViewHolder() functions are called.
+ */
+@SuppressWarnings({"PMD.MethodNamingConventions"})
+public class SectionBindingTest {
+
+    private static final int ITEMS_QTY = 10;
+
+    private SectionedRecyclerViewAdapter sectionAdapter;
+
+    @Rule
+    public ExpectedException expectedException = ExpectedException.none();
+
+    @Spy
+    private SectionImpl dummySection = new SectionImpl(); // This one is first, so that the section of interest is second.
+
+    @Spy
+    private SectionImpl section = new SectionImpl();
+
+    @Before
+    public void setup() {
+        MockitoAnnotations.initMocks(this);
+        sectionAdapter = new AdapterImpl();
+        sectionAdapter.addSection(dummySection); // View types 0-5, items 0-9
+        sectionAdapter.addSection(section); // View types 6-11, items 10-19
+    }
+
+    @Test
+    public void onCreateViewHolder_withItemResourceId_calls_getItemViewHolder() {
+        // When
+        sectionAdapter.onCreateViewHolder(null, 6 + SectionedRecyclerViewAdapter.VIEW_TYPE_ITEM_LOADED);
+
+        // Then
+        verify(dummySection, never()).getItemView(any(ViewGroup.class));
+        verify(dummySection, never()).getItemViewHolder(any(View.class));
+        verify(section, never()).getItemView(any(ViewGroup.class));
+        verify(section, times(1)).getItemViewHolder(argThat(hasTag(-1)));
+    }
+
+    @Test
+    public void onCreateViewHolder_withItemViewProvided_calls_getItemView() {
+        // Given
+        Section providingSection = spy(new SectionImpl(SectionParameters.builder().itemViewWillBeProvided()));
+        sectionAdapter.addSection(providingSection); // Third section, view types 12-17
+        doReturn(dummyViewWithTag(42)).when(providingSection).getItemView(null);
+
+        // When
+        sectionAdapter.onCreateViewHolder(null, 12 + SectionedRecyclerViewAdapter.VIEW_TYPE_ITEM_LOADED);
+
+        // Then
+        verify(section, never()).getItemView(any(ViewGroup.class));
+        verify(section, never()).getItemViewHolder(any(View.class));
+        verify(providingSection, times(1)).getItemView(null);
+        verify(providingSection, times(1)).getItemViewHolder(argThat(hasTag(42)));
+    }
+
+    @Test
+    public void onCreateViewHolder_withItemViewProvided_throws_when_getItemView_returns_null() {
+        // Given
+        Section providingSection = spy(new SectionImpl(SectionParameters.builder().itemViewWillBeProvided()));
+        sectionAdapter.addSection(providingSection); // Third section, view types 12-17
+        doReturn(null).when(providingSection).getItemView(null);
+
+        // Expect exception
+        expectedException.expect(NullPointerException.class);
+        expectedException.expectMessage("Section.getItemView() returned null");
+
+        // When
+        sectionAdapter.onCreateViewHolder(null, 12 + SectionedRecyclerViewAdapter.VIEW_TYPE_ITEM_LOADED);
+    }
+
+    @Test
+    public void onCreateViewHolder_withHeaderResourceId_calls_getHeaderViewHolder() {
+        // Given
+        Section headedSection = spy(new SectionImpl(SectionParameters.builder().itemResourceId(-1).headerResourceId(-2)));
+        sectionAdapter.addSection(headedSection);
+
+        // When
+        sectionAdapter.onCreateViewHolder(null, 12 + SectionedRecyclerViewAdapter.VIEW_TYPE_HEADER);
+
+        // Then
+        verify(section, never()).getHeaderView(any(ViewGroup.class));
+        verify(section, never()).getHeaderViewHolder(any(View.class));
+        verify(headedSection, never()).getHeaderView(any(ViewGroup.class));
+        verify(headedSection, times(1)).getHeaderViewHolder(argThat(hasTag(-2)));
+    }
+
+    @Test
+    public void onCreateViewHolder_withHeaderViewProvided_calls_getHeaderView() {
+        // Given
+        Section providingSection = spy(new SectionImpl(SectionParameters.builder().itemResourceId(-1).headerViewWillBeProvided()));
+        sectionAdapter.addSection(providingSection); // Third section, view types 12-17
+        doReturn(dummyViewWithTag(42)).when(providingSection).getHeaderView(null);
+
+        // When
+        sectionAdapter.onCreateViewHolder(null, 12 + SectionedRecyclerViewAdapter.VIEW_TYPE_HEADER);
+
+        // Then
+        verify(providingSection, times(1)).getHeaderView(null);
+        verify(providingSection, times(1)).getHeaderViewHolder(argThat(hasTag(42)));
+    }
+
+    @Test
+    public void onCreateViewHolder_withHeaderViewProvided_throws_when_getHeaderView_returns_null() {
+        // Given
+        Section providingSection = spy(new SectionImpl(SectionParameters.builder().itemResourceId(-1).headerViewWillBeProvided()));
+        sectionAdapter.addSection(providingSection); // Third section, view types 12-17
+        doReturn(null).when(providingSection).getHeaderView(null);
+
+        // Expect exception
+        expectedException.expect(NullPointerException.class);
+        expectedException.expectMessage("Section.getHeaderView() returned null");
+
+        // When
+        sectionAdapter.onCreateViewHolder(null, 12 + SectionedRecyclerViewAdapter.VIEW_TYPE_HEADER);
+    }
+
+    @Test
+    public void onCreateViewHolder_withFooterResourceId_calls_getFooterViewHolder() {
+        // Given
+        Section footedSection = spy(new SectionImpl(SectionParameters.builder().itemResourceId(-1).footerResourceId(-3)));
+        sectionAdapter.addSection(footedSection);
+
+        // When
+        sectionAdapter.onCreateViewHolder(null, 12 + SectionedRecyclerViewAdapter.VIEW_TYPE_FOOTER);
+
+        // Then
+        verify(section, never()).getFooterView(any(ViewGroup.class));
+        verify(section, never()).getFooterViewHolder(any(View.class));
+        verify(footedSection, never()).getFooterView(any(ViewGroup.class));
+        verify(footedSection, times(1)).getFooterViewHolder(argThat(hasTag(-3)));
+    }
+
+    @Test
+    public void onCreateViewHolder_withFooterViewProvided_calls_getFooterView() {
+        // Given
+        Section providingSection = spy(new SectionImpl(SectionParameters.builder().itemResourceId(-1).footerViewWillBeProvided()));
+        sectionAdapter.addSection(providingSection); // Third section, view types 12-17
+        doReturn(dummyViewWithTag(42)).when(providingSection).getFooterView(null);
+
+        // When
+        sectionAdapter.onCreateViewHolder(null, 12 + SectionedRecyclerViewAdapter.VIEW_TYPE_FOOTER);
+
+        // Then
+        verify(providingSection, times(1)).getFooterView(null);
+        verify(providingSection, times(1)).getFooterViewHolder(argThat(hasTag(42)));
+    }
+
+    @Test
+    public void onCreateViewHolder_withFooterViewProvided_throws_when_getFooterView_returns_null() {
+        // Given
+        Section providingSection = spy(new SectionImpl(SectionParameters.builder().itemResourceId(-1).footerViewWillBeProvided()));
+        sectionAdapter.addSection(providingSection); // Third section, view types 12-17
+        doReturn(null).when(providingSection).getFooterView(null);
+
+        // Expect exception
+        expectedException.expect(NullPointerException.class);
+        expectedException.expectMessage("Section.getFooterView() returned null");
+
+        // When
+        sectionAdapter.onCreateViewHolder(null, 12 + SectionedRecyclerViewAdapter.VIEW_TYPE_FOOTER);
+    }
+
+    @Test
+    public void onCreateViewHolder_withLoadingResourceId_calls_getLoadingViewHolder() {
+        // Given
+        Section resourceSection = spy(new SectionImpl(SectionParameters.builder().itemResourceId(-1).loadingResourceId(-5)));
+        sectionAdapter.addSection(resourceSection); // Third section, view types 12-17
+
+        // When
+        sectionAdapter.onCreateViewHolder(null, 12 + SectionedRecyclerViewAdapter.VIEW_TYPE_LOADING);
+
+        // Then
+        verify(resourceSection, never()).getLoadingView(any(ViewGroup.class));
+        verify(resourceSection, times(1)).getLoadingViewHolder(argThat(hasTag(-5)));
+    }
+
+    @Test
+    public void onCreateViewHolder_withLoadingViewProvided_calls_getLoadingView() {
+        // Given
+        Section providingSection = spy(new SectionImpl(SectionParameters.builder().itemResourceId(-1).loadingViewWillBeProvided()));
+        sectionAdapter.addSection(providingSection); // Third section, view types 12-17
+        doReturn(dummyViewWithTag(42)).when(providingSection).getLoadingView(null);
+
+        // When
+        sectionAdapter.onCreateViewHolder(null, 12 + SectionedRecyclerViewAdapter.VIEW_TYPE_LOADING);
+
+        // Then
+        verify(providingSection, times(1)).getLoadingView(null);
+        verify(providingSection, times(1)).getLoadingViewHolder(argThat(hasTag(42)));
+    }
+
+    @Test
+    public void onCreateViewHolder_withLoadingViewProvided_throws_when_getLoadingView_returns_null() {
+        // Given
+        Section providingSection = spy(new SectionImpl(SectionParameters.builder().itemResourceId(-1).loadingViewWillBeProvided()));
+        sectionAdapter.addSection(providingSection); // Third section, view types 12-17
+        doReturn(null).when(providingSection).getLoadingView(null);
+
+        // Expect exception
+        expectedException.expect(NullPointerException.class);
+        expectedException.expectMessage("Section.getLoadingView() returned null");
+
+        // When
+        sectionAdapter.onCreateViewHolder(null, 12 + SectionedRecyclerViewAdapter.VIEW_TYPE_LOADING);
+    }
+
+    @Test
+    public void onCreateViewHolder_withFailedResourceId_calls_getFailedViewHolder() {
+        // Given
+        Section resourceSection = spy(new SectionImpl(SectionParameters.builder().itemResourceId(-1)
+                .loadingResourceId(-5)
+                .failedResourceId(-6)));
+        sectionAdapter.addSection(resourceSection); // Third section, view types 12-17
+
+        // When
+        sectionAdapter.onCreateViewHolder(null, 12 + SectionedRecyclerViewAdapter.VIEW_TYPE_FAILED);
+
+        // Then
+        verify(resourceSection, never()).getFailedView(any(ViewGroup.class));
+        verify(resourceSection, times(1)).getFailedViewHolder(argThat(hasTag(-6)));
+    }
+
+    @Test
+    public void onCreateViewHolder_withFailedViewProvided_calls_getFailedView() {
+        // Given
+        Section providingSection = spy(new SectionImpl(SectionParameters.builder().itemResourceId(-1).failedViewWillBeProvided()));
+        sectionAdapter.addSection(providingSection); // Third section, view types 12-17
+        doReturn(dummyViewWithTag(42)).when(providingSection).getFailedView(null);
+
+        // When
+        sectionAdapter.onCreateViewHolder(null, 12 + SectionedRecyclerViewAdapter.VIEW_TYPE_FAILED);
+
+        // Then
+        verify(providingSection, times(1)).getFailedView(null);
+        verify(providingSection, times(1)).getFailedViewHolder(argThat(hasTag(42)));
+    }
+
+    @Test
+    public void onCreateViewHolder_withFailedViewProvided_throws_when_getFailedView_returns_null() {
+        // Given
+        Section providingSection = spy(new SectionImpl(SectionParameters.builder().itemResourceId(-1).failedViewWillBeProvided()));
+        sectionAdapter.addSection(providingSection); // Third section, view types 12-17
+        doReturn(null).when(providingSection).getFailedView(null);
+
+        // Expect exception
+        expectedException.expect(NullPointerException.class);
+        expectedException.expectMessage("Section.getFailedView() returned null");
+
+        // When
+        sectionAdapter.onCreateViewHolder(null, 12 + SectionedRecyclerViewAdapter.VIEW_TYPE_FAILED);
+    }
+
+    @Test
+    public void onCreateViewHolder_withEmptyResourceId_calls_getEmptyViewHolder() {
+        // When
+        sectionAdapter.onCreateViewHolder(null, 6 + SectionedRecyclerViewAdapter.VIEW_TYPE_EMPTY);
+
+        // Then
+        verify(section, never()).getEmptyView(any(ViewGroup.class));
+        verify(section, times(1)).getEmptyViewHolder(argThat(hasTag(-1)));
+    }
+
+    @Test
+    public void onCreateViewHolder_withEmptyViewProvided_calls_getEmptyView() {
+        // Given
+        Section providingSection = spy(new SectionImpl(SectionParameters.builder().itemResourceId(-1).emptyViewWillBeProvided()));
+        sectionAdapter.addSection(providingSection); // Third section, view types 12-17
+        doReturn(dummyViewWithTag(42)).when(providingSection).getEmptyView(null);
+
+        // When
+        sectionAdapter.onCreateViewHolder(null, 12 + SectionedRecyclerViewAdapter.VIEW_TYPE_EMPTY);
+
+        // Then
+        verify(providingSection, times(1)).getEmptyView(null);
+        verify(providingSection, times(1)).getEmptyViewHolder(argThat(hasTag(42)));
+    }
+
+    @Test
+    public void onCreateViewHolder_withEmptyViewProvided_throws_when_getEmptyView_returns_null() {
+        // Given
+        Section providingSection = spy(new SectionImpl(SectionParameters.builder().itemResourceId(-1).emptyViewWillBeProvided()));
+        sectionAdapter.addSection(providingSection); // Third section, view types 12-17
+        doReturn(null).when(providingSection).getEmptyView(null);
+
+        // Expect exception
+        expectedException.expect(NullPointerException.class);
+        expectedException.expectMessage("Section.getEmptyView() returned null");
+
+        // When
+        sectionAdapter.onCreateViewHolder(null, 12 + SectionedRecyclerViewAdapter.VIEW_TYPE_EMPTY);
+    }
+
+    @Test
+    public void onBindViewHolder_withSection_isCalled() {
+        // When
+        // Section - Items [10-19]
+        sectionAdapter.onBindViewHolder(null, 10);
+
+        // Then
+        verify(section, times(1)).onBindItemViewHolder(null, 0);
+    }
+
+    @Test
+    public void onBindLoadingViewHolder_withSection_isCalled() {
+        // Given
+        section.setState(State.LOADING);
+
+        // When
+        // Section - Loading [10]
+        sectionAdapter.onBindViewHolder(null, 10);
+
+        // Then
+        verify(section, times(1)).onBindLoadingViewHolder(null);
+    }
+
+    @Test
+    public void onBindFailedViewHolder_withSection_isCalled() {
+        // Given
+        section.setState(State.FAILED);
+
+        // When
+        // Section - Failed [10]
+        sectionAdapter.onBindViewHolder(null, 10);
+
+        // Then
+        verify(section, times(1)).onBindFailedViewHolder(null);
+    }
+
+    @Test
+    public void onBindEmptyViewHolder_withSection_isCalled() {
+        // Given
+        section.setState(State.EMPTY);
+
+        // When
+        // Section - Empty [10]
+        sectionAdapter.onBindViewHolder(null, 10);
+
+        // Then
+        verify(section, times(1)).onBindEmptyViewHolder(null);
+    }
+
+    @Test
+    public void onBindViewHolder_withHeadedSection_isCalled() {
+        // Given
+        Section headedSection = spy(new SectionImpl(SectionParameters.builder().itemResourceId(-1).headerResourceId(-1)));
+        sectionAdapter.addSection(headedSection); // Third section, items 10-19
+
+        // When
+        // HeadedSection - Header [20]
+        sectionAdapter.onBindViewHolder(null, 20);
+        // HeadedSection - Items [21-30]
+        sectionAdapter.onBindViewHolder(null, 22);
+
+        // Then
+        verify(headedSection, times(1)).onBindHeaderViewHolder(null);
+        verify(headedSection, times(1)).onBindItemViewHolder(null, 22 - 21);
+    }
+
+    @Test
+    public void onBindViewHolder_withFootedSection_isCalled() {
+        // Given
+        Section footedSection = spy(new SectionImpl(SectionParameters.builder().itemResourceId(-1).footerViewWillBeProvided()));
+        sectionAdapter.addSection(footedSection); // Third section, items 10-19
+
+        // When
+        // FootedSection - Items [20-29]
+        sectionAdapter.onBindViewHolder(null, 25);
+        // FootedSection - Footer [30]
+        sectionAdapter.onBindViewHolder(null, 30);
+
+        // Then
+        verify(footedSection, times(1)).onBindItemViewHolder(null, 25 - 20);
+        verify(footedSection, times(1)).onBindFooterViewHolder(null);
+    }
+
+    @Test
+    public void onBindViewHolder_withHeadedFootedSection_isCalled() {
+        // Given
+        Section headedFootedSection = spy(new SectionImpl(SectionParameters.builder()
+                .itemViewWillBeProvided()
+                .headerViewWillBeProvided()
+                .footerResourceId(-1)));
+        sectionAdapter.addSection(headedFootedSection); // Third section, items 10-19
+
+        // When
+        // HeadedFootedSection - Header [20]
+        sectionAdapter.onBindViewHolder(null, 20);
+        // HeadedFootedSection - Items [21-30]
+        sectionAdapter.onBindViewHolder(null, 21);
+        sectionAdapter.onBindViewHolder(null, 28);
+        // HeadedFootedSection - Footer [31]
+        sectionAdapter.onBindViewHolder(null, 31);
+
+        // Then
+        verify(headedFootedSection, times(1)).onBindHeaderViewHolder(null);
+        verify(headedFootedSection, times(1)).onBindItemViewHolder(null, 0);
+        verify(headedFootedSection, times(1)).onBindItemViewHolder(null, 28 - 21);
+        verify(headedFootedSection, times(1)).onBindFooterViewHolder(null);
+    }
+
+    private static class SectionImpl extends Section {
+
+        SectionImpl(SectionParameters.Builder builder) {
+            super(builder.build());
+        }
+
+        SectionImpl() {
+            super(SectionParameters.builder()
+                    .itemResourceId(-1)
+                    .emptyResourceId(-1)
+                    .failedViewWillBeProvided()
+                    .loadingViewWillBeProvided()
+                    .build());
+        }
+
+        @Override
+        public int getContentItemsTotal() {
+            return ITEMS_QTY;
+        }
+
+        @Override
+        public RecyclerView.ViewHolder getItemViewHolder(View view) {
+            return null;
+        }
+
+        @Override
+        public void onBindItemViewHolder(RecyclerView.ViewHolder holder, int position) {
+        }
+    }
+
+    /**
+     * Override the inflate method in order to avoid mocking the LayoutInflater.
+     */
+    private static class AdapterImpl extends SectionedRecyclerViewAdapter {
+        @Override
+        View inflate(int layoutResourceId, ViewGroup parent) {
+            return dummyViewWithTag(layoutResourceId);
+        }
+    }
+
+    /**
+     * @param tag Any integer value.
+     * @return A View that will have its tag set to the given value, to recognize it later on.
+     */
+    private static View dummyViewWithTag(int tag) {
+        View view = mock(View.class);
+        when(view.getTag()).thenReturn(tag);
+        return view;
+    }
+
+    /**
+     * @param tag Any integer value.
+     * @return A Mockito argument matcher to check whether the argument was a View with its tag set to the given value.
+     */
+    private static ArgumentMatcher<View> hasTag(final int tag) {
+        return new ArgumentMatcher<View>() {
+            @Override
+            public boolean matches(View argument) {
+                return argument != null && argument.getTag() != null && argument.getTag().equals(tag);
+            }
+        };
+    }
+}
diff --git a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/SectionParametersTest.java b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/SectionParametersTest.java
new file mode 100644
index 0000000..8c99100
--- /dev/null
+++ b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/SectionParametersTest.java
@@ -0,0 +1,153 @@
+package io.github.luizgrp.sectionedrecyclerviewadapter;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.junit.Assert.assertThat;
+
+/*
+ * Unit tests for SectionParameters
+ */
+@SuppressWarnings({"PMD.MethodNamingConventions"})
+public class SectionParametersTest {
+
+    @Rule
+    public ExpectedException expectedException = ExpectedException.none();
+
+    @Test
+    public void constructor_withValidParameters_throwsNoExceptions() {
+        // Given
+        final int itemId = 1;
+        final int footerId = 3;
+        final int loadingId = 5;
+        final int emptyId = 6;
+
+        // When
+        SectionParameters sectionParameters = SectionParameters.builder()
+                .itemResourceId(itemId)
+                .headerViewWillBeProvided()
+                .footerResourceId(footerId)
+                .failedViewWillBeProvided()
+                .loadingResourceId(loadingId)
+                .emptyResourceId(emptyId)
+                .build();
+
+        // Then
+        assertThat(sectionParameters.itemResourceId, is(itemId));
+        assertThat(sectionParameters.itemViewWillBeProvided, is(false));
+        assertThat(sectionParameters.headerResourceId, is(nullValue()));
+        assertThat(sectionParameters.headerViewWillBeProvided, is(true));
+        assertThat(sectionParameters.footerResourceId, is(footerId));
+        assertThat(sectionParameters.footerViewWillBeProvided, is(false));
+        assertThat(sectionParameters.failedResourceId, is(nullValue()));
+        assertThat(sectionParameters.failedViewWillBeProvided, is(true));
+        assertThat(sectionParameters.loadingResourceId, is(loadingId));
+        assertThat(sectionParameters.loadingViewWillBeProvided, is(false));
+        assertThat(sectionParameters.emptyResourceId, is(emptyId));
+        assertThat(sectionParameters.emptyViewWillBeProvided, is(false));
+    }
+
+    @Test
+    public void legacyConstructor_withValidParameters_throwsNoExceptions() {
+        // Given
+        final int itemId = 1;
+        final int footerId = 3;
+        final int loadingId = 5;
+
+        // When
+        SectionParameters sectionParameters = new SectionParameters.Builder(itemId)
+                .headerViewWillBeProvided()
+                .footerResourceId(footerId)
+                .failedViewWillBeProvided()
+                .loadingResourceId(loadingId)
+                .emptyViewWillBeProvided()
+                .build();
+
+        // Then
+        assertThat(sectionParameters.itemResourceId, is(itemId));
+        assertThat(sectionParameters.itemViewWillBeProvided, is(false));
+        assertThat(sectionParameters.headerResourceId, is(nullValue()));
+        assertThat(sectionParameters.headerViewWillBeProvided, is(true));
+        assertThat(sectionParameters.footerResourceId, is(footerId));
+        assertThat(sectionParameters.footerViewWillBeProvided, is(false));
+        assertThat(sectionParameters.failedResourceId, is(nullValue()));
+        assertThat(sectionParameters.failedViewWillBeProvided, is(true));
+        assertThat(sectionParameters.loadingResourceId, is(loadingId));
+        assertThat(sectionParameters.loadingViewWillBeProvided, is(false));
+        assertThat(sectionParameters.emptyResourceId, is(nullValue()));
+        assertThat(sectionParameters.emptyViewWillBeProvided, is(true));
+    }
+
+    @Test
+    public void constructor_withConflictingItemParameters_throwsException() {
+        // Given
+        final int itemId = 1;
+        final int footerId = 3;
+        final int loadingId = 5;
+        final int emptyId = 6;
+
+        // Expect exception
+        expectedException.expect(IllegalArgumentException.class);
+        expectedException.expectMessage("itemResourceId and itemViewWillBeProvided cannot both be set");
+
+        // When
+        SectionParameters.builder()
+                .itemResourceId(itemId)
+                .itemViewWillBeProvided()
+                .headerViewWillBeProvided()
+                .footerResourceId(footerId)
+                .failedViewWillBeProvided()
+                .loadingResourceId(loadingId)
+                .emptyResourceId(emptyId)
+                .build();
+    }
+
+    @Test
+    public void constructor_withoutMandatoryItemParameter_throwsException() {
+        // Given
+        final int footerId = 3;
+        final int loadingId = 5;
+        final int emptyId = 6;
+
+        // Expect exception
+        expectedException.expect(IllegalArgumentException.class);
+        expectedException.expectMessage("Either itemResourceId or itemViewWillBeProvided must be set");
+
+        // When
+        SectionParameters.builder()
+                .headerViewWillBeProvided()
+                .footerResourceId(footerId)
+                .failedViewWillBeProvided()
+                .loadingResourceId(loadingId)
+                .emptyResourceId(emptyId)
+                .build();
+    }
+
+    @Test
+    public void constructor_withConflictingFooterParameters_throwsException() {
+        // Given
+        final int itemId = 1;
+        final int footerId = 3;
+        final int loadingId = 5;
+        final int emptyId = 6;
+
+        // Expect exception
+        expectedException.expect(IllegalArgumentException.class);
+        expectedException.expectMessage("footerResourceId and footerViewWillBeProvided cannot both be set");
+
+        // When
+        SectionParameters.builder()
+                .itemResourceId(itemId)
+                .headerViewWillBeProvided()
+                .footerResourceId(footerId)
+                .footerViewWillBeProvided()
+                .failedViewWillBeProvided()
+                .loadingResourceId(loadingId)
+                .emptyResourceId(emptyId)
+                .build();
+    }
+
+}
diff --git a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/SectionTest.java b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/SectionTest.java
index ed14628..cdc1687 100644
--- a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/SectionTest.java
+++ b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/SectionTest.java
@@ -3,263 +3,188 @@
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
-import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
-
-import io.github.luizgrp.sectionedrecyclerviewadapter.testdoubles.spy.BindingFootedSectionSpy;
-import io.github.luizgrp.sectionedrecyclerviewadapter.testdoubles.spy.BindingHeadedFootedSectionSpy;
-import io.github.luizgrp.sectionedrecyclerviewadapter.testdoubles.spy.BindingHeadedSectionSpy;
-import io.github.luizgrp.sectionedrecyclerviewadapter.testdoubles.spy.BindingSectionSpy;
-import io.github.luizgrp.sectionedrecyclerviewadapter.testdoubles.stub.SectionStub;
+import org.junit.rules.ExpectedException;
 
 import static io.github.luizgrp.sectionedrecyclerviewadapter.Section.State;
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
 
-/**
- * Unit tests for {@link Section}
+/*
+ * Unit tests for Section
  */
+@SuppressWarnings({"PMD.MethodNamingConventions"})
 public class SectionTest {
 
-    private final int ITEMS_QTY = 10;
-
-    private SectionedRecyclerViewAdapter sectionAdapter;
-
-    @Before
-    public void setup() {
-        sectionAdapter = new SectionedRecyclerViewAdapter();
-    }
+    @Rule
+    public ExpectedException expectedException = ExpectedException.none();
 
     @Test
     public void constructor_withSectionParameters_constructsCorrectSection() {
         // Given
-        final int ITEM_ID = 1;
-        final int HEADER_ID = 2;
-        final int FOOTER_ID = 3;
-        final int FAILED_ID = 4;
-        final int LOADING_ID = 5;
-        final int EMPTY_ID = 6;
+        final int itemId = 1;
+        final int headerId = 2;
+        final int footerId = 3;
+        final int failedId = 4;
+        final int loadingId = 5;
+        final int emptyId = 6;
 
         @SuppressWarnings("ResourceType")
-        SectionParameters sectionParameters = new SectionParameters.Builder(ITEM_ID)
-                .headerResourceId(HEADER_ID)
-                .footerResourceId(FOOTER_ID)
-                .failedResourceId(FAILED_ID)
-                .loadingResourceId(LOADING_ID)
-                .emptyResourceId(EMPTY_ID)
+        SectionParameters sectionParameters = SectionParameters.builder()
+                .itemResourceId(itemId)
+                .headerResourceId(headerId)
+                .footerResourceId(footerId)
+                .failedResourceId(failedId)
+                .loadingResourceId(loadingId)
+                .emptyResourceId(emptyId)
                 .build();
-        Section section = getSection(sectionParameters);
 
         // When
-        int resultItemId = section.getItemResourceId();
-        int resultHeaderId = section.getHeaderResourceId();
-        int resultFooterId = section.getFooterResourceId();
-        int resultFailedId = section.getFailedResourceId();
-        int resultLoadingId = section.getLoadingResourceId();
-        int resultEmptyId = section.getEmptyResourceId();
-        boolean resultHasHeader = section.hasHeader();
-        boolean resultHasFooter = section.hasFooter();
+        Section section = getSection(sectionParameters);
 
         // Then
-        assertThat(resultItemId, is(ITEM_ID));
-        assertThat(resultHeaderId, is(HEADER_ID));
-        assertThat(resultFooterId, is(FOOTER_ID));
-        assertThat(resultFailedId, is(FAILED_ID));
-        assertThat(resultLoadingId, is(LOADING_ID));
-        assertThat(resultEmptyId, is(EMPTY_ID));
-        assertThat(resultHasHeader, is(true));
-        assertThat(resultHasFooter, is(true));
+        assertThat(section.getItemResourceId(), is(itemId));
+        assertThat(section.isItemViewWillBeProvided(), is(false));
+        assertThat(section.getHeaderResourceId(), is(headerId));
+        assertThat(section.isHeaderViewWillBeProvided(), is(false));
+        assertThat(section.getFooterResourceId(), is(footerId));
+        assertThat(section.isFooterViewWillBeProvided(), is(false));
+        assertThat(section.getFailedResourceId(), is(failedId));
+        assertThat(section.isFailedViewWillBeProvided(), is(false));
+        assertThat(section.getLoadingResourceId(), is(loadingId));
+        assertThat(section.isLoadingViewWillBeProvided(), is(false));
+        assertThat(section.getEmptyResourceId(), is(emptyId));
+        assertThat(section.isEmptyViewWillBeProvided(), is(false));
+        assertThat(section.hasHeader(), is(true));
+        assertThat(section.hasFooter(), is(true));
     }
 
-    public void setState_withValidLoadingResId_succeeds() {
+    @Test
+    public void constructor_withProvidedSectionParameters_constructsCorrectSection() {
         // Given
-        final int ITEM_ID = 1;
-        final int LOADING_ID = 2;
-
-        @SuppressWarnings("ResourceType")
-        SectionParameters sectionParameters = new SectionParameters.Builder(ITEM_ID)
-                .loadingResourceId(LOADING_ID)
-                .build();
-        Section section = getSection(sectionParameters);
-
-        // When
-        section.setState(State.LOADING);
+        final int emptyId = 6;
 
-        // Then
-        assertThat(section.getState(), is(State.LOADING));
-    }
-    
-    @Test(expected = IllegalStateException.class)
-    public void setState_withMissingLoadingResId_throwsException() {
-        // Given
-        final int ITEM_ID = 1;
-        
         @SuppressWarnings("ResourceType")
-        SectionParameters sectionParameters = new SectionParameters.Builder(ITEM_ID)
+        SectionParameters sectionParameters = SectionParameters.builder()
+                .itemViewWillBeProvided()
+                .headerViewWillBeProvided()
+                .loadingViewWillBeProvided()
+                .emptyResourceId(emptyId)
                 .build();
-        Section section = getSection(sectionParameters);
 
         // When
-        section.setState(State.LOADING);
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void setState_withMissingFailedResId_throwsException() {
-        // Given
-        final int ITEM_ID = 1;
-
-        @SuppressWarnings("ResourceType")
-        SectionParameters sectionParameters = new SectionParameters.Builder(ITEM_ID)
-                .build();
         Section section = getSection(sectionParameters);
 
-        // When
-        section.setState(State.FAILED);
+        // Then
+        assertThat(section.getItemResourceId(), is(nullValue()));
+        assertThat(section.isItemViewWillBeProvided(), is(true));
+        assertThat(section.getHeaderResourceId(), is(nullValue()));
+        assertThat(section.isHeaderViewWillBeProvided(), is(true));
+        assertThat(section.getFooterResourceId(), is(nullValue()));
+        assertThat(section.isFooterViewWillBeProvided(), is(false));
+        assertThat(section.getFailedResourceId(), is(nullValue()));
+        assertThat(section.isFailedViewWillBeProvided(), is(false));
+        assertThat(section.getLoadingResourceId(), is(nullValue()));
+        assertThat(section.isLoadingViewWillBeProvided(), is(true));
+        assertThat(section.getEmptyResourceId(), is(emptyId));
+        assertThat(section.isEmptyViewWillBeProvided(), is(false));
+        assertThat(section.hasHeader(), is(true));
+        assertThat(section.hasFooter(), is(false));
     }
 
-    @Test(expected = IllegalStateException.class)
-    public void setState_withEmptyFailedResId_throwsException() {
+    @Test
+    public void setState_withValidLoadingResId_succeeds() {
         // Given
-        final int ITEM_ID = 1;
+        final int itemId = 1;
+        final int loadingId = 2;
 
         @SuppressWarnings("ResourceType")
-        SectionParameters sectionParameters = new SectionParameters.Builder(ITEM_ID)
+        SectionParameters sectionParameters = SectionParameters.builder()
+                .itemResourceId(itemId)
+                .loadingResourceId(loadingId)
                 .build();
         Section section = getSection(sectionParameters);
 
         // When
-        section.setState(State.EMPTY);
-    }
-
-    @Test
-    public void onBindViewHolder_withSection_isCalled() {
-        // Given
-        sectionAdapter.addSection(new SectionStub(ITEMS_QTY));
-
-        BindingSectionSpy sectionSpy = new BindingSectionSpy(ITEMS_QTY);
-        sectionAdapter.addSection(sectionSpy);
-
-        // When
-        // Section - Items [10-19]
-        sectionAdapter.onBindViewHolder(null, 10);
+        section.setState(State.LOADING);
 
         // Then
-        assertTrue(sectionSpy.onBindItemViewHolderWasCalled);
+        assertThat(section.getState(), is(State.LOADING));
     }
 
     @Test
-    public void onBindLoadingViewHolder_withSection_isCalled() {
+    public void setState_withLoadingViewProvided_succeeds() {
         // Given
-        sectionAdapter.addSection(new SectionStub(ITEMS_QTY));
+        final int itemId = 1;
 
-        BindingSectionSpy sectionSpy = new BindingSectionSpy(ITEMS_QTY);
-        sectionAdapter.addSection(sectionSpy);
-
-        sectionSpy.setState(State.LOADING);
+        @SuppressWarnings("ResourceType")
+        SectionParameters sectionParameters = SectionParameters.builder()
+                .itemResourceId(itemId)
+                .loadingViewWillBeProvided()
+                .build();
+        Section section = getSection(sectionParameters);
 
         // When
-        // Section - Loading [10]
-        sectionAdapter.onBindViewHolder(null, 10);
+        section.setState(State.LOADING);
 
         // Then
-        assertTrue(sectionSpy.onBindLoadingViewHolderWasCalled);
+        assertThat(section.getState(), is(State.LOADING));
     }
 
     @Test
-    public void onBindFailedViewHolder_withSection_isCalled() {
+    public void setState_withMissingLoadingParameter_throwsException() {
         // Given
-        sectionAdapter.addSection(new SectionStub(ITEMS_QTY));
+        final int itemId = 1;
 
-        BindingSectionSpy sectionSpy = new BindingSectionSpy(ITEMS_QTY);
-        sectionAdapter.addSection(sectionSpy);
+        @SuppressWarnings("ResourceType")
+        SectionParameters sectionParameters = SectionParameters.builder()
+                .itemResourceId(itemId)
+                .build();
+        Section section = getSection(sectionParameters);
 
-        sectionSpy.setState(State.FAILED);
+        // Expect exception
+        expectedException.expect(IllegalStateException.class);
 
         // When
-        // Section - Failed [10]
-        sectionAdapter.onBindViewHolder(null, 10);
-
-        // Then
-        assertTrue(sectionSpy.onBindFailedViewHolderWasCalled);
+        section.setState(State.LOADING);
     }
 
     @Test
-    public void onBindEmptyViewHolder_withSection_isCalled() {
+    public void setState_withMissingFailedResId_throwsException() {
         // Given
-        sectionAdapter.addSection(new SectionStub(ITEMS_QTY));
-
-        BindingSectionSpy sectionSpy = new BindingSectionSpy(ITEMS_QTY);
-        sectionAdapter.addSection(sectionSpy);
-
-        sectionSpy.setState(State.EMPTY);
-
-        // When
-        // Section - Empty [10]
-        sectionAdapter.onBindViewHolder(null, 10);
+        final int itemId = 1;
 
-        // Then
-        assertTrue(sectionSpy.onBindEmptyViewHolderWasCalled);
-    }
-
-    @Test
-    public void onBindViewHolder_withHeadedSection_isCalled() {
-        // Given
-        sectionAdapter.addSection(new SectionStub(ITEMS_QTY));
+        @SuppressWarnings("ResourceType")
+        SectionParameters sectionParameters = SectionParameters.builder()
+                .itemResourceId(itemId)
+                .build();
+        Section section = getSection(sectionParameters);
 
-        BindingHeadedSectionSpy sectionSpy = new BindingHeadedSectionSpy(ITEMS_QTY);
-        sectionAdapter.addSection(sectionSpy);
+        // Expect exception
+        expectedException.expect(IllegalStateException.class);
 
         // When
-        // HeadedSection - Header [10]
-        sectionAdapter.onBindViewHolder(null, 10);
-        // HeadedSection - Items [11-20]
-        sectionAdapter.onBindViewHolder(null, 11);
-
-        // Then
-        assertTrue(sectionSpy.onBindHeaderViewHolderWasCalled);
-        assertTrue(sectionSpy.onBindItemViewHolderWasCalled);
+        section.setState(State.FAILED);
     }
 
     @Test
-    public void onBindViewHolder_withFootedSection_isCalled() {
+    public void setState_withEmptyFailedResId_throwsException() {
         // Given
-        sectionAdapter.addSection(new SectionStub(ITEMS_QTY));
-
-        BindingFootedSectionSpy sectionSpy = new BindingFootedSectionSpy(ITEMS_QTY);
-        sectionAdapter.addSection(sectionSpy);
+        final int itemId = 1;
 
-        // When
-        // FootedSection - Items [10-19]
-        sectionAdapter.onBindViewHolder(null, 10);
-        // FootedSection - Footer [20]
-        sectionAdapter.onBindViewHolder(null, 20);
-
-        // Then
-        assertTrue(sectionSpy.onBindItemViewHolderWasCalled);
-        assertTrue(sectionSpy.onBindFooterViewHolderWasCalled);
-    }
-
-    @Test
-    public void onBindViewHolder_withHeadedFootedSection_isCalled() {
-        // Given
-        sectionAdapter.addSection(new SectionStub(ITEMS_QTY));
+        @SuppressWarnings("ResourceType")
+        SectionParameters sectionParameters = SectionParameters.builder()
+                .itemResourceId(itemId)
+                .build();
+        Section section = getSection(sectionParameters);
 
-        BindingHeadedFootedSectionSpy sectionSpy = new BindingHeadedFootedSectionSpy(ITEMS_QTY);
-        sectionAdapter.addSection(sectionSpy);
+        // Expect exception
+        expectedException.expect(IllegalStateException.class);
 
         // When
-        // HeadedFootedSection - Header [10]
-        sectionAdapter.onBindViewHolder(null, 10);
-        // HeadedFootedSection - Item [11]
-        sectionAdapter.onBindViewHolder(null, 11);
-        // HeadedFootedSection - Footer [21]
-        sectionAdapter.onBindViewHolder(null, 21);
-
-        // Then
-        assertTrue(sectionSpy.onBindHeaderViewHolderWasCalled);
-        assertTrue(sectionSpy.onBindItemViewHolderWasCalled);
-        assertTrue(sectionSpy.onBindFooterViewHolderWasCalled);
+        section.setState(State.EMPTY);
     }
 
     private Section getSection(SectionParameters sectionParameters) {
diff --git a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/SectionedRecyclerViewAdapterNotifyTest.java b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/SectionedRecyclerViewAdapterNotifyTest.java
new file mode 100644
index 0000000..9b0c2dc
--- /dev/null
+++ b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/SectionedRecyclerViewAdapterNotifyTest.java
@@ -0,0 +1,701 @@
+package io.github.luizgrp.sectionedrecyclerviewadapter;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import io.github.luizgrp.sectionedrecyclerviewadapter.testdoubles.stub.HeadedFootedSectionStub;
+import io.github.luizgrp.sectionedrecyclerviewadapter.testdoubles.stub.HeadedFootedStatelessSectionStub;
+import io.github.luizgrp.sectionedrecyclerviewadapter.testdoubles.stub.StatelessSectionStub;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+
+public class SectionedRecyclerViewAdapterNotifyTest {
+
+    private static final int ITEMS_QTY = 10;
+    private static final String SECTION_TAG = "tag";
+
+    SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter;
+
+    @Before
+    public void setup() {
+        spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
+    }
+
+    @Test
+    public void notifyItemInsertedInSectionUsingTag_withAdapterWithManySections_callsSuperNotifyItemInserted() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemInserted(anyInt());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, new HeadedFootedStatelessSectionStub(ITEMS_QTY));
+
+        // When
+        spySectionedRecyclerViewAdapter.notifyItemInsertedInSection(SECTION_TAG, 0);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemInserted(11);
+    }
+
+    @Test
+    public void notifyItemInsertedInSectionUsingSection_withAdapterWithManySections_callsSuperNotifyItemInserted() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemInserted(anyInt());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        HeadedFootedStatelessSectionStub headedFootedStatelessSectionStub = new HeadedFootedStatelessSectionStub(ITEMS_QTY);
+        spySectionedRecyclerViewAdapter.addSection(headedFootedStatelessSectionStub);
+
+        // When
+        spySectionedRecyclerViewAdapter.notifyItemInsertedInSection(headedFootedStatelessSectionStub, 0);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemInserted(11);
+    }
+
+    @Test
+    public void notifyItemRangeInsertedInSectionUsingTag_withAdapterWithManySections_callsSuperNotifyItemRangeInserted() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeInserted(anyInt(), anyInt());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, new HeadedFootedStatelessSectionStub(ITEMS_QTY));
+
+        // When
+        spySectionedRecyclerViewAdapter.notifyItemRangeInsertedInSection(SECTION_TAG, 0, 4);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeInserted(11, 4);
+    }
+
+    @Test
+    public void notifyItemRangeInsertedInSectionUsingSection_withAdapterWithManySections_callsSuperNotifyItemRangeInserted() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeInserted(anyInt(), anyInt());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        HeadedFootedStatelessSectionStub headedFootedStatelessSectionStub = new HeadedFootedStatelessSectionStub(ITEMS_QTY);
+        spySectionedRecyclerViewAdapter.addSection(headedFootedStatelessSectionStub);
+
+        // When
+        spySectionedRecyclerViewAdapter.notifyItemRangeInsertedInSection(headedFootedStatelessSectionStub, 0, 4);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeInserted(11, 4);
+    }
+
+    @Test
+    public void notifyItemRemovedFromSectionUsingTag_withAdapterWithManySections_callsSuperNotifyItemRemoved() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRemoved(anyInt());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, new HeadedFootedStatelessSectionStub(ITEMS_QTY));
+
+        // When
+        spySectionedRecyclerViewAdapter.notifyItemRemovedFromSection(SECTION_TAG, 0);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRemoved(11);
+    }
+
+    @Test
+    public void notifyItemRemovedFromSectionUsingSection_withAdapterWithManySections_callsSuperNotifyItemRemoved() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRemoved(anyInt());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        HeadedFootedStatelessSectionStub headedFootedStatelessSectionStub = new HeadedFootedStatelessSectionStub(ITEMS_QTY);
+        spySectionedRecyclerViewAdapter.addSection(headedFootedStatelessSectionStub);
+
+        // When
+        spySectionedRecyclerViewAdapter.notifyItemRemovedFromSection(headedFootedStatelessSectionStub, 0);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRemoved(11);
+    }
+
+    @Test
+    public void notifyItemRangeRemovedInSectionUsingTag_withAdapterWithManySections_callsSuperNotifyItemRangeRemoved() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeRemoved(anyInt(), anyInt());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, new HeadedFootedStatelessSectionStub(ITEMS_QTY));
+
+        // When
+        spySectionedRecyclerViewAdapter.notifyItemRangeRemovedFromSection(SECTION_TAG, 0, 4);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeRemoved(11, 4);
+    }
+
+    @Test
+    public void notifyItemRangeRemovedInSectionUsingSection_withAdapterWithManySections_callsSuperNotifyItemRangeRemoved() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeRemoved(anyInt(), anyInt());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        HeadedFootedStatelessSectionStub headedFootedStatelessSectionStub = new HeadedFootedStatelessSectionStub(ITEMS_QTY);
+        spySectionedRecyclerViewAdapter.addSection(headedFootedStatelessSectionStub);
+
+        // When
+        spySectionedRecyclerViewAdapter.notifyItemRangeRemovedFromSection(headedFootedStatelessSectionStub, 0, 4);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeRemoved(11, 4);
+    }
+
+    @Test
+    public void notifyItemChangedInSectionUsingTag_withAdapterWithManySections_callsSuperNotifyItemChangedInSection() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, new HeadedFootedStatelessSectionStub(ITEMS_QTY));
+
+        // When
+        spySectionedRecyclerViewAdapter.notifyItemChangedInSection(SECTION_TAG, 0);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(11);
+    }
+
+    @Test
+    public void notifyItemChangedInSectionUsingSection_withAdapterWithManySections_callsSuperNotifyItemChangedInSection() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        HeadedFootedStatelessSectionStub headedFootedStatelessSectionStub = new HeadedFootedStatelessSectionStub(ITEMS_QTY);
+        spySectionedRecyclerViewAdapter.addSection(headedFootedStatelessSectionStub);
+
+        // When
+        spySectionedRecyclerViewAdapter.notifyItemChangedInSection(headedFootedStatelessSectionStub, 0);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(11);
+    }
+
+    @Test
+    public void notifyHeaderChangedInSectionUsingTag_withAdapterWithManySections_callsSuperNotifyItemChangedInSection() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, new HeadedFootedStatelessSectionStub(ITEMS_QTY));
+
+        // When
+        spySectionedRecyclerViewAdapter.notifyHeaderChangedInSection(SECTION_TAG);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(10);
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void notifyHeaderChangedInSectionUsingTag_withAdapterWithManySections_throwsIllegalStateException() {
+        // Given
+        SectionedRecyclerViewAdapter sectionAdapter = new SectionedRecyclerViewAdapter();
+        sectionAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        sectionAdapter.addSection(SECTION_TAG, new StatelessSectionStub(ITEMS_QTY));
+
+        // When
+        sectionAdapter.notifyHeaderChangedInSection(SECTION_TAG);
+    }
+
+    @Test
+    public void notifyFooterChangedInSectionUsingTag_withAdapterWithManySections_callsSuperNotifyItemChangedInSection() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, new HeadedFootedStatelessSectionStub(ITEMS_QTY));
+
+        // When
+        spySectionedRecyclerViewAdapter.notifyFooterChangedInSection(SECTION_TAG);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(21);
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void notifyFooterChangedInSectionUsingTag_withAdapterWithManySections_throwsIllegalStateException() {
+        // Given
+        SectionedRecyclerViewAdapter sectionAdapter = new SectionedRecyclerViewAdapter();
+        sectionAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        sectionAdapter.addSection(SECTION_TAG, new StatelessSectionStub(ITEMS_QTY));
+
+        // When
+        sectionAdapter.notifyFooterChangedInSection(SECTION_TAG);
+    }
+
+    @Test
+    public void notifyItemRangeChangedInSectionUsingTag_withAdapterWithManySections_callsSuperNotifyItemRangeChanged() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeChanged(anyInt(), anyInt());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, new HeadedFootedStatelessSectionStub(ITEMS_QTY));
+
+        // When
+        spySectionedRecyclerViewAdapter.notifyItemRangeChangedInSection(SECTION_TAG, 0, 4);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeChanged(11, 4);
+    }
+
+    @Test
+    public void notifyItemRangeChangedInSectionUsingSection_withAdapterWithManySections_callsSuperNotifyItemRangeChanged() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeChanged(anyInt(), anyInt());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        HeadedFootedStatelessSectionStub headedFootedStatelessSectionStub = new HeadedFootedStatelessSectionStub(ITEMS_QTY);
+        spySectionedRecyclerViewAdapter.addSection(headedFootedStatelessSectionStub);
+
+        // When
+        spySectionedRecyclerViewAdapter.notifyItemRangeChangedInSection(headedFootedStatelessSectionStub, 0, 4);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeChanged(11, 4);
+    }
+
+    @Test
+    public void notifyItemRangeChangedInSectionWithPayloadUsingTag_withAdapterWithManySections_callsSuperNotifyItemRangeChanged() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeChanged(anyInt(), anyInt(), any());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, new HeadedFootedStatelessSectionStub(ITEMS_QTY));
+
+        // When
+        spySectionedRecyclerViewAdapter.notifyItemRangeChangedInSection(SECTION_TAG, 0, 4, null);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeChanged(11, 4, null);
+    }
+
+    @Test
+    public void notifyItemRangeChangedInSectionWithPayloadUsingSection_withAdapterWithManySections_callsSuperNotifyItemRangeChanged() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeChanged(anyInt(), anyInt(), any());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        HeadedFootedStatelessSectionStub headedFootedStatelessSectionStub = new HeadedFootedStatelessSectionStub(ITEMS_QTY);
+        spySectionedRecyclerViewAdapter.addSection(headedFootedStatelessSectionStub);
+
+        // When
+        spySectionedRecyclerViewAdapter.notifyItemRangeChangedInSection(headedFootedStatelessSectionStub, 0, 4, null);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeChanged(11, 4, null);
+    }
+
+    @Test
+    public void notifyItemMovedInSectionUsingTag_withAdapterWithManySections_callsSuperNotifyItemMoved() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemMoved(anyInt(), anyInt());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, new HeadedFootedStatelessSectionStub(ITEMS_QTY));
+
+        // When
+        spySectionedRecyclerViewAdapter.notifyItemMovedInSection(SECTION_TAG, 0, 4);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemMoved(11, 15);
+    }
+
+    @Test
+    public void notifyItemMovedInSectionUsingSection_withAdapterWithManySections_callsSuperNotifyItemMoved() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemMoved(anyInt(), anyInt());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        HeadedFootedStatelessSectionStub headedFootedStatelessSectionStub = new HeadedFootedStatelessSectionStub(ITEMS_QTY);
+        spySectionedRecyclerViewAdapter.addSection(headedFootedStatelessSectionStub);
+
+        // When
+        spySectionedRecyclerViewAdapter.notifyItemMovedInSection(headedFootedStatelessSectionStub, 0, 4);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemMoved(11, 15);
+    }
+
+    @Test
+    public void notifyNotLoadedStateChangedUsingTag_withAdapterWithManySections_callsNotifyItemChanged() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
+        headedFootedSectionStub.setState(Section.State.LOADING);
+
+        // When
+        Section.State previousState = headedFootedSectionStub.getState();
+        headedFootedSectionStub.setState(Section.State.EMPTY);
+        spySectionedRecyclerViewAdapter.notifyNotLoadedStateChanged(SECTION_TAG, previousState);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(11);
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void notifyNotLoadedStateChangedUsingTag_withNoStateChange_throwsException() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
+
+        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
+        headedFootedSectionStub.setState(Section.State.LOADING);
+
+        // When
+        spySectionedRecyclerViewAdapter.notifyNotLoadedStateChanged(SECTION_TAG, headedFootedSectionStub.getState());
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void notifyNotLoadedStateChangedUsingTag_withLoadedAsPreviousState_throwsException() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
+
+        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
+        headedFootedSectionStub.setState(Section.State.LOADING);
+
+        // When
+        spySectionedRecyclerViewAdapter.notifyNotLoadedStateChanged(SECTION_TAG, Section.State.LOADED);
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void notifyNotLoadedStateChangedUsingTag_withLoadedAsCurrentState_throwsException() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
+
+        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
+        headedFootedSectionStub.setState(Section.State.LOADING);
+
+        // When
+        Section.State previousState = headedFootedSectionStub.getState();
+        headedFootedSectionStub.setState(Section.State.LOADED);
+        spySectionedRecyclerViewAdapter.notifyNotLoadedStateChanged(SECTION_TAG, previousState);
+    }
+
+    @Test
+    public void notifyStateChangedToLoadedUsingTag_withAdapterWithManySections_callsNotifyItemChanged_callsNotifyItemInserted() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeInserted(anyInt(), anyInt());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
+        headedFootedSectionStub.setState(Section.State.LOADING);
+
+        // When
+        Section.State previousState = headedFootedSectionStub.getState();
+        headedFootedSectionStub.setState(Section.State.LOADED);
+        spySectionedRecyclerViewAdapter.notifyStateChangedToLoaded(SECTION_TAG, previousState);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(11);
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeInserted(12, 9);
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void notifyStateChangedToLoadedUsingTag_withNoStateChange_throwsException() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
+
+        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
+        headedFootedSectionStub.setState(Section.State.LOADED);
+
+        // When
+        spySectionedRecyclerViewAdapter.notifyStateChangedToLoaded(SECTION_TAG, headedFootedSectionStub.getState());
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void notifyStateChangedToLoadedUsingTag_withCurrentStateNotLoadedAndLoadedAsPreviousState_throwsException() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
+
+        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
+        headedFootedSectionStub.setState(Section.State.LOADED);
+
+        // When
+        Section.State previousState = headedFootedSectionStub.getState();
+        headedFootedSectionStub.setState(Section.State.EMPTY);
+        spySectionedRecyclerViewAdapter.notifyStateChangedToLoaded(SECTION_TAG, previousState);
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void notifyStateChangedToLoadedUsingTag_withCurrentStateNotLoadedAndPreviousStateNotLoaded_throwsException() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
+
+        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
+        headedFootedSectionStub.setState(Section.State.LOADING);
+
+        // When
+        Section.State previousState = headedFootedSectionStub.getState();
+        headedFootedSectionStub.setState(Section.State.EMPTY);
+        spySectionedRecyclerViewAdapter.notifyStateChangedToLoaded(SECTION_TAG, previousState);
+    }
+
+    @Test
+    public void notifyStateChangedToLoadedUsingTag_withContentItemsTotal0_callsNotifyItemRemoved() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRemoved(anyInt());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(0);
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
+        headedFootedSectionStub.setState(Section.State.LOADING);
+
+        // When
+        Section.State previousState = headedFootedSectionStub.getState();
+        headedFootedSectionStub.setState(Section.State.LOADED);
+        spySectionedRecyclerViewAdapter.notifyStateChangedToLoaded(SECTION_TAG, previousState);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRemoved(11);
+    }
+
+    @Test
+    public void notifyStateChangedToLoadedUsingTag_withContentItemsTotal1_callsNotifyItemChanged() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(1);
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
+        headedFootedSectionStub.setState(Section.State.LOADING);
+
+        // When
+        Section.State previousState = headedFootedSectionStub.getState();
+        headedFootedSectionStub.setState(Section.State.LOADED);
+        spySectionedRecyclerViewAdapter.notifyStateChangedToLoaded(SECTION_TAG, previousState);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(11);
+        verify(spySectionedRecyclerViewAdapter, never()).callSuperNotifyItemRangeInserted(anyInt(), anyInt());
+    }
+
+    @Test
+    public void notifyStateChangedFromLoadedUsingTag_withAdapterWithManySections_callsNotifyItemRangeRemoved_callsNotifyItemChanged() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeRemoved(anyInt(), anyInt());
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
+        headedFootedSectionStub.setState(Section.State.LOADED);
+
+        // When
+        int previousContentItemsTotal = headedFootedSectionStub.getContentItemsTotal();
+        headedFootedSectionStub.setState(Section.State.EMPTY);
+        spySectionedRecyclerViewAdapter.notifyStateChangedFromLoaded(SECTION_TAG, previousContentItemsTotal);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeRemoved(12, 9);
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(11);
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void notifyStateChangedFromLoadedUsingTag_withLoadedAsCurrentState_throwsException() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeRemoved(anyInt(), anyInt());
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
+
+        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
+        headedFootedSectionStub.setState(Section.State.LOADED);
+
+        // When
+        spySectionedRecyclerViewAdapter.notifyStateChangedFromLoaded(SECTION_TAG, headedFootedSectionStub.getContentItemsTotal());
+    }
+
+    @Test
+    public void notifyStateChangedFromLoadedUsingTag_withPreviousContentItemsCount0_callsNotifyItemInserted() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemInserted(anyInt());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(0);
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
+        headedFootedSectionStub.setState(Section.State.LOADED);
+
+        // When
+        int previousContentItemsTotal = headedFootedSectionStub.getContentItemsTotal();
+        headedFootedSectionStub.setState(Section.State.EMPTY);
+        spySectionedRecyclerViewAdapter.notifyStateChangedFromLoaded(SECTION_TAG, previousContentItemsTotal);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemInserted(11);
+    }
+
+    @Test
+    public void notifyStateChangedFromLoadedUsingTag_withPreviousContentItemsCount1_callsNotifyItemChanged() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(1);
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
+        headedFootedSectionStub.setState(Section.State.LOADED);
+
+        // When
+        int previousContentItemsTotal = headedFootedSectionStub.getContentItemsTotal();
+        headedFootedSectionStub.setState(Section.State.EMPTY);
+        spySectionedRecyclerViewAdapter.notifyStateChangedFromLoaded(SECTION_TAG, previousContentItemsTotal);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(11);
+        verify(spySectionedRecyclerViewAdapter, never()).callSuperNotifyItemRangeRemoved(anyInt(), anyInt());
+    }
+
+    @Test
+    public void notifyHeaderInsertedInSectionUsingTag_withAdapterWithManySections_callsSuperNotifyItemInserted() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemInserted(anyInt());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
+        headedFootedSectionStub.setHasHeader(false);
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
+
+        // When
+        headedFootedSectionStub.setHasHeader(true);
+        spySectionedRecyclerViewAdapter.notifyHeaderInsertedInSection(SECTION_TAG);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemInserted(10);
+    }
+
+    @Test
+    public void notifyFooterInsertedInSectionUsingTag_withAdapterWithManySections_callsSuperNotifyItemInserted() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemInserted(anyInt());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
+        headedFootedSectionStub.setHasFooter(false);
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
+
+        // When
+        headedFootedSectionStub.setHasFooter(true);
+        spySectionedRecyclerViewAdapter.notifyFooterInsertedInSection(SECTION_TAG);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemInserted(21);
+    }
+
+    @Test
+    public void notifyHeaderRemovedFromSectionUsingTag_withAdapterWithManySections_callsSuperNotifyItemRemoved() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRemoved(anyInt());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
+        headedFootedSectionStub.setHasHeader(true);
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
+
+        // When
+        headedFootedSectionStub.setHasHeader(false);
+        spySectionedRecyclerViewAdapter.notifyHeaderRemovedFromSection(SECTION_TAG);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRemoved(10);
+    }
+
+    @Test
+    public void notifyFooterRemovedFromSectionUsingTag_withAdapterWithManySections_callsSuperNotifyItemRemoved() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRemoved(anyInt());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
+        headedFootedSectionStub.setHasFooter(true);
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
+
+        // When
+        headedFootedSectionStub.setHasFooter(false);
+        spySectionedRecyclerViewAdapter.notifyFooterRemovedFromSection(SECTION_TAG);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRemoved(21);
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void notifySectionChangedToVisibleUsingTag_withInvisibleSection_throwsException() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeInserted(anyInt(), anyInt());
+
+        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
+        headedFootedSectionStub.setVisible(false);
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
+
+        // When
+        spySectionedRecyclerViewAdapter.notifySectionChangedToVisible(SECTION_TAG);
+    }
+
+    @Test(expected = IllegalStateException.class)
+    public void notifySectionChangedToInvisibleUsingTag_withVisibleSection_throwsException() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeRemoved(anyInt(), anyInt());
+
+        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
+        headedFootedSectionStub.setVisible(true);
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
+
+        // When
+        int previousSectionPosition = spySectionedRecyclerViewAdapter.getSectionPosition(headedFootedSectionStub);
+        spySectionedRecyclerViewAdapter.notifySectionChangedToInvisible(SECTION_TAG, previousSectionPosition);
+    }
+
+    @Test
+    public void notifySectionChangedToVisibleUsingTag_withAdapterWithManySections_callsSuperNotifyItemRangeInserted() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeInserted(anyInt(), anyInt());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
+        headedFootedSectionStub.setVisible(false);
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
+
+        // When
+        headedFootedSectionStub.setVisible(true);
+        spySectionedRecyclerViewAdapter.notifySectionChangedToVisible(SECTION_TAG);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeInserted(10, 12);
+    }
+
+    @Test
+    public void notifySectionChangedToInvisibleUsingTag_withAdapterWithManySections_callsSuperNotifyItemRangeInserted() {
+        // Given
+        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeRemoved(anyInt(), anyInt());
+
+        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
+        headedFootedSectionStub.setVisible(true);
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
+
+        // When
+        int previousSectionPosition = spySectionedRecyclerViewAdapter.getSectionPosition(headedFootedSectionStub);
+        headedFootedSectionStub.setVisible(false);
+        spySectionedRecyclerViewAdapter.notifySectionChangedToInvisible(SECTION_TAG, previousSectionPosition);
+
+        // Then
+        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeRemoved(10, 12);
+    }
+}
diff --git a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/SectionedRecyclerViewAdapterTest.java b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/SectionedRecyclerViewAdapterTest.java
index afba5f8..ada7c44 100644
--- a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/SectionedRecyclerViewAdapterTest.java
+++ b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/SectionedRecyclerViewAdapterTest.java
@@ -18,20 +18,19 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 
-/**
- * Unit tests for {@link SectionedRecyclerViewAdapter}
+/*
+ * Unit tests for SectionedRecyclerViewAdapter
  */
+@SuppressWarnings({"PMD.MethodNamingConventions"})
 public class SectionedRecyclerViewAdapterTest {
 
-    private final int ITEMS_QTY = 10;
-    private final String SECTION_TAG = "tag";
+    private static final int ITEMS_QTY = 10;
+    private static final String SECTION_TAG = "tag";
 
     private SectionedRecyclerViewAdapter sectionAdapter;
 
@@ -79,18 +78,18 @@ public void getSectionPositionUsingTag_withInvalidTag_throwsException() {
     }
 
     @Test
-    public void getSectionPositionUsingTag_withAdapterWithInvisibleSection_returnsCorrectPosition() {
+    public void getSectionPositionUsingTag_callsGetSectionPositionUsingSection() {
         // Given
-        addStatelessSectionStubToAdapter();
-        addInvisibleStatelessSectionStubToAdapter();
+        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
 
-        sectionAdapter.addSection(SECTION_TAG, new StatelessSectionStub(ITEMS_QTY));
+        SectionStub sectionStub = new SectionStub(ITEMS_QTY);
+        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, sectionStub);
 
         // When
-        int result = sectionAdapter.getSectionPosition(SECTION_TAG);
+        spySectionedRecyclerViewAdapter.getSectionPosition(SECTION_TAG);
 
         // Then
-        assertThat(result, is(10));
+        verify(spySectionedRecyclerViewAdapter).getSectionPosition(sectionStub);
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -133,20 +132,20 @@ public void onBindViewHolder_withEmptyAdapter_throwsException() {
     }
 
     @Test
-    public void addSection_withEmptyAdapter_succeeds() {
+    public void addSectionUsingSection_withEmptyAdapter_succeeds() {
         // Given
         Section section = new StatelessSectionStub(ITEMS_QTY);
 
         // When
-        sectionAdapter.addSection(SECTION_TAG, section);
+        String result = sectionAdapter.addSection(section);
 
         // Then
-        assertSame(sectionAdapter.getSection(SECTION_TAG), section);
-        assertSame(sectionAdapter.getSectionsMap().get(SECTION_TAG), section);
+        assertSame(sectionAdapter.getSection(result), section);
+        assertSame(sectionAdapter.getCopyOfSectionsMap().get(result), section);
     }
 
     @Test
-    public void addSectionWithTag_withEmptyAdapter_succeeds() {
+    public void addSectionUsingTag_withEmptyAdapter_succeeds() {
         // Given
         Section section = new StatelessSectionStub(ITEMS_QTY);
 
@@ -155,19 +154,20 @@ public void addSectionWithTag_withEmptyAdapter_succeeds() {
 
         // Then
         assertSame(sectionAdapter.getSection(SECTION_TAG), section);
-        assertSame(sectionAdapter.getSectionsMap().get(SECTION_TAG), section);
+        assertSame(sectionAdapter.getCopyOfSectionsMap().get(SECTION_TAG), section);
     }
 
     @Test
     public void getSectionWithTag_withRemovedSection_returnsNull() {
         // Given
         sectionAdapter.addSection(SECTION_TAG, new StatelessSectionStub(ITEMS_QTY));
+        sectionAdapter.removeSection(SECTION_TAG);
 
         // When
-        sectionAdapter.removeSection(SECTION_TAG);
+        Section result = sectionAdapter.getSection(SECTION_TAG);
 
         // Then
-        assertNull(sectionAdapter.getSection(SECTION_TAG));
+        assertNull(result);
     }
 
     @Test
@@ -179,6 +179,78 @@ public void getSectionWithTag_withEmptyAdapter_returnsNull() {
         assertNull(result);
     }
 
+    @Test
+    public void removeSectionWithTag_withEmptyAdapter_failsSilently() {
+        // When
+        sectionAdapter.removeSection(SECTION_TAG);
+
+        // Then
+        assertTrue(sectionAdapter.getCopyOfSectionsMap().isEmpty());
+    }
+
+    @Test
+    public void removeSectionWithTag_withInvalidTag_doesNotRemoveAnything() {
+        // Given
+        addFourStatelessSectionsAndFourSectionsToAdapter();
+
+        // When
+        sectionAdapter.removeSection(SECTION_TAG);
+
+        // Then
+        assertThat(sectionAdapter.getCopyOfSectionsMap().size(), is(8));
+        assertNull(sectionAdapter.getSection(SECTION_TAG));
+    }
+
+    @Test
+    public void removeSectionWithTag_withAdapterWithManySections_succeeds() {
+        // Given
+        addFourStatelessSectionsAndFourSectionsToAdapter();
+        sectionAdapter.addSection(SECTION_TAG, new StatelessSectionStub(ITEMS_QTY));
+
+        // When
+        sectionAdapter.removeSection(SECTION_TAG);
+
+        // Then
+        assertThat(sectionAdapter.getCopyOfSectionsMap().size(), is(8));
+        assertNull(sectionAdapter.getSection(SECTION_TAG));
+    }
+
+    @Test
+    public void removeSection_withEmptyAdapter_failsSilently() {
+        // When
+        sectionAdapter.removeSection(new SectionStub(ITEMS_QTY));
+
+        // Then
+        assertTrue(sectionAdapter.getCopyOfSectionsMap().isEmpty());
+    }
+
+    @Test
+    public void removeSection_withInvalidSection_doesNotRemoveAnything() {
+        // Given
+        addFourStatelessSectionsAndFourSectionsToAdapter();
+
+        // When
+        sectionAdapter.removeSection(new SectionStub(ITEMS_QTY));
+
+        // Then
+        assertThat(sectionAdapter.getCopyOfSectionsMap().size(), is(8));
+    }
+
+    @Test
+    public void removeSection_withAdapterWithManySections_succeeds() {
+        // Given
+        addFourStatelessSectionsAndFourSectionsToAdapter();
+        final StatelessSectionStub section = new StatelessSectionStub(ITEMS_QTY);
+        sectionAdapter.addSection(SECTION_TAG, section);
+
+        // When
+        sectionAdapter.removeSection(section);
+
+        // Then
+        assertThat(sectionAdapter.getCopyOfSectionsMap().size(), is(8));
+        assertNull(sectionAdapter.getSection(SECTION_TAG));
+    }
+
     @Test
     public void getItemCount_withEmptyAdapter_isZero() {
         // When
@@ -202,22 +274,22 @@ public void getItemCount_withAdapterWithInvisibleSection_returnsCorrectQuantity(
     }
 
     @Test
-    public void getSectionsMap_withEmptyAdapter_isEmpty() {
+    public void getCopyOfSectionsMap_withEmptyAdapter_isEmpty() {
         // When
-        boolean result = sectionAdapter.getSectionsMap().isEmpty();
+        boolean result = sectionAdapter.getCopyOfSectionsMap().isEmpty();
 
         // Then
         assertTrue(result);
     }
 
     @Test
-    public void getSectionsMap_withAdapterWithInvisibleSection_hasCorrectSize() {
+    public void getCopyOfSectionsMap_withAdapterWithInvisibleSection_hasCorrectSize() {
         // Given
         addStatelessSectionStubToAdapter();
         addInvisibleStatelessSectionStubToAdapter();
 
         // When
-        int result = sectionAdapter.getSectionsMap().size();
+        int result = sectionAdapter.getCopyOfSectionsMap().size();
 
         // Then
         assertThat(result, is(2));
@@ -447,7 +519,7 @@ public void removeAllSections_withAdapterWithManySections_succeeds() {
 
         // Then
         assertThat(sectionAdapter.getItemCount(), is(0));
-        assertTrue(sectionAdapter.getSectionsMap().isEmpty());
+        assertTrue(sectionAdapter.getCopyOfSectionsMap().isEmpty());
     }
 
     @Test
@@ -527,717 +599,6 @@ public void getFooterPositionInAdapterUsingTag_withAdapterWithManySections_throw
         sectionAdapter.getFooterPositionInAdapter(SECTION_TAG);
     }
 
-    @Test
-    public void notifyItemInsertedInSectionUsingTag_withAdapterWithManySections_callsSuperNotifyItemInserted() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemInserted(anyInt());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, new HeadedFootedStatelessSectionStub(ITEMS_QTY));
-
-        // When
-        spySectionedRecyclerViewAdapter.notifyItemInsertedInSection(SECTION_TAG, 0);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemInserted(11);
-    }
-
-    @Test
-    public void notifyItemInsertedInSectionUsingSection_withAdapterWithManySections_callsSuperNotifyItemInserted() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemInserted(anyInt());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        HeadedFootedStatelessSectionStub headedFootedStatelessSectionStub = new HeadedFootedStatelessSectionStub(ITEMS_QTY);
-        spySectionedRecyclerViewAdapter.addSection(headedFootedStatelessSectionStub);
-
-        // When
-        spySectionedRecyclerViewAdapter.notifyItemInsertedInSection(headedFootedStatelessSectionStub, 0);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemInserted(11);
-    }
-
-    @Test
-    public void notifyItemRangeInsertedInSectionUsingTag_withAdapterWithManySections_callsSuperNotifyItemRangeInserted() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeInserted(anyInt(), anyInt());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, new HeadedFootedStatelessSectionStub(ITEMS_QTY));
-
-        // When
-        spySectionedRecyclerViewAdapter.notifyItemRangeInsertedInSection(SECTION_TAG, 0, 4);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeInserted(11, 4);
-    }
-
-    @Test
-    public void notifyItemRangeInsertedInSectionUsingSection_withAdapterWithManySections_callsSuperNotifyItemRangeInserted() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeInserted(anyInt(), anyInt());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        HeadedFootedStatelessSectionStub headedFootedStatelessSectionStub = new HeadedFootedStatelessSectionStub(ITEMS_QTY);
-        spySectionedRecyclerViewAdapter.addSection(headedFootedStatelessSectionStub);
-
-        // When
-        spySectionedRecyclerViewAdapter.notifyItemRangeInsertedInSection(headedFootedStatelessSectionStub, 0, 4);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeInserted(11, 4);
-    }
-
-    @Test
-    public void notifyItemRemovedFromSectionUsingTag_withAdapterWithManySections_callsSuperNotifyItemRemoved() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRemoved(anyInt());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, new HeadedFootedStatelessSectionStub(ITEMS_QTY));
-
-        // When
-        spySectionedRecyclerViewAdapter.notifyItemRemovedFromSection(SECTION_TAG, 0);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRemoved(11);
-    }
-
-    @Test
-    public void notifyItemRemovedFromSectionUsingSection_withAdapterWithManySections_callsSuperNotifyItemRemoved() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRemoved(anyInt());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        HeadedFootedStatelessSectionStub headedFootedStatelessSectionStub = new HeadedFootedStatelessSectionStub(ITEMS_QTY);
-        spySectionedRecyclerViewAdapter.addSection(headedFootedStatelessSectionStub);
-
-        // When
-        spySectionedRecyclerViewAdapter.notifyItemRemovedFromSection(headedFootedStatelessSectionStub, 0);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRemoved(11);
-    }
-
-    @Test
-    public void notifyItemRangeRemovedInSectionUsingTag_withAdapterWithManySections_callsSuperNotifyItemRangeRemoved() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeRemoved(anyInt(), anyInt());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, new HeadedFootedStatelessSectionStub(ITEMS_QTY));
-
-        // When
-        spySectionedRecyclerViewAdapter.notifyItemRangeRemovedFromSection(SECTION_TAG, 0, 4);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeRemoved(11, 4);
-    }
-
-    @Test
-    public void notifyItemRangeRemovedInSectionUsingSection_withAdapterWithManySections_callsSuperNotifyItemRangeRemoved() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeRemoved(anyInt(), anyInt());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        HeadedFootedStatelessSectionStub headedFootedStatelessSectionStub = new HeadedFootedStatelessSectionStub(ITEMS_QTY);
-        spySectionedRecyclerViewAdapter.addSection(headedFootedStatelessSectionStub);
-
-        // When
-        spySectionedRecyclerViewAdapter.notifyItemRangeRemovedFromSection(headedFootedStatelessSectionStub, 0, 4);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeRemoved(11, 4);
-    }
-
-    @Test
-    public void notifyItemChangedInSectionUsingTag_withAdapterWithManySections_callsSuperNotifyItemChangedInSection() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, new HeadedFootedStatelessSectionStub(ITEMS_QTY));
-
-        // When
-        spySectionedRecyclerViewAdapter.notifyItemChangedInSection(SECTION_TAG, 0);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(11);
-    }
-
-    @Test
-    public void notifyItemChangedInSectionUsingSection_withAdapterWithManySections_callsSuperNotifyItemChangedInSection() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        HeadedFootedStatelessSectionStub headedFootedStatelessSectionStub = new HeadedFootedStatelessSectionStub(ITEMS_QTY);
-        spySectionedRecyclerViewAdapter.addSection(headedFootedStatelessSectionStub);
-
-        // When
-        spySectionedRecyclerViewAdapter.notifyItemChangedInSection(headedFootedStatelessSectionStub, 0);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(11);
-    }
-
-    @Test
-    public void notifyHeaderChangedInSectionUsingTag_withAdapterWithManySections_callsSuperNotifyItemChangedInSection() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, new HeadedFootedStatelessSectionStub(ITEMS_QTY));
-
-        // When
-        spySectionedRecyclerViewAdapter.notifyHeaderChangedInSection(SECTION_TAG);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(10);
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void notifyHeaderChangedInSectionUsingTag_withAdapterWithManySections_throwsIllegalStateException() {
-        // Given
-        sectionAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        sectionAdapter.addSection(SECTION_TAG, new StatelessSectionStub(ITEMS_QTY));
-
-        // When
-        sectionAdapter.notifyHeaderChangedInSection(SECTION_TAG);
-    }
-
-    @Test
-    public void notifyFooterChangedInSectionUsingTag_withAdapterWithManySections_callsSuperNotifyItemChangedInSection() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, new HeadedFootedStatelessSectionStub(ITEMS_QTY));
-
-        // When
-        spySectionedRecyclerViewAdapter.notifyFooterChangedInSection(SECTION_TAG);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(21);
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void notifyFooterChangedInSectionUsingTag_withAdapterWithManySections_throwsIllegalStateException() {
-        // Given
-        sectionAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        sectionAdapter.addSection(SECTION_TAG, new StatelessSectionStub(ITEMS_QTY));
-
-        // When
-        sectionAdapter.notifyFooterChangedInSection(SECTION_TAG);
-    }
-    
-    @Test
-    public void notifyItemRangeChangedInSectionUsingTag_withAdapterWithManySections_callsSuperNotifyItemRangeChanged() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeChanged(anyInt(), anyInt());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, new HeadedFootedStatelessSectionStub(ITEMS_QTY));
-
-        // When
-        spySectionedRecyclerViewAdapter.notifyItemRangeChangedInSection(SECTION_TAG, 0, 4);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeChanged(11, 4);
-    }
-
-    @Test
-    public void notifyItemRangeChangedInSectionUsingSection_withAdapterWithManySections_callsSuperNotifyItemRangeChanged() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeChanged(anyInt(), anyInt());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        HeadedFootedStatelessSectionStub headedFootedStatelessSectionStub = new HeadedFootedStatelessSectionStub(ITEMS_QTY);
-        spySectionedRecyclerViewAdapter.addSection(headedFootedStatelessSectionStub);
-
-        // When
-        spySectionedRecyclerViewAdapter.notifyItemRangeChangedInSection(headedFootedStatelessSectionStub, 0, 4);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeChanged(11, 4);
-    }
-
-    @Test
-    public void notifyItemRangeChangedInSectionWithPayloadUsingTag_withAdapterWithManySections_callsSuperNotifyItemRangeChanged() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeChanged(anyInt(), anyInt(), any());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, new HeadedFootedStatelessSectionStub(ITEMS_QTY));
-
-        // When
-        spySectionedRecyclerViewAdapter.notifyItemRangeChangedInSection(SECTION_TAG, 0, 4, null);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeChanged(11, 4, null);
-    }
-
-    @Test
-    public void notifyItemRangeChangedInSectionWithPayloadUsingSection_withAdapterWithManySections_callsSuperNotifyItemRangeChanged() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeChanged(anyInt(), anyInt(), any());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        HeadedFootedStatelessSectionStub headedFootedStatelessSectionStub = new HeadedFootedStatelessSectionStub(ITEMS_QTY);
-        spySectionedRecyclerViewAdapter.addSection(headedFootedStatelessSectionStub);
-
-        // When
-        spySectionedRecyclerViewAdapter.notifyItemRangeChangedInSection(headedFootedStatelessSectionStub, 0, 4, null);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeChanged(11, 4, null);
-    }
-
-    @Test
-    public void notifyItemMovedInSectionUsingTag_withAdapterWithManySections_callsSuperNotifyItemMoved() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemMoved(anyInt(), anyInt());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, new HeadedFootedStatelessSectionStub(ITEMS_QTY));
-
-        // When
-        spySectionedRecyclerViewAdapter.notifyItemMovedInSection(SECTION_TAG, 0, 4);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemMoved(11, 15);
-    }
-
-    @Test
-    public void notifyItemMovedInSectionUsingSection_withAdapterWithManySections_callsSuperNotifyItemMoved() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemMoved(anyInt(), anyInt());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        HeadedFootedStatelessSectionStub headedFootedStatelessSectionStub = new HeadedFootedStatelessSectionStub(ITEMS_QTY);
-        spySectionedRecyclerViewAdapter.addSection(headedFootedStatelessSectionStub);
-
-        // When
-        spySectionedRecyclerViewAdapter.notifyItemMovedInSection(headedFootedStatelessSectionStub, 0, 4);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemMoved(11, 15);
-    }
-
-    @Test
-    public void notifyNotLoadedStateChangedUsingTag_withAdapterWithManySections_callsNotifyItemChanged() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
-        headedFootedSectionStub.setState(State.LOADING);
-
-        // When
-        State previousState = headedFootedSectionStub.getState();
-        headedFootedSectionStub.setState(State.EMPTY);
-        spySectionedRecyclerViewAdapter.notifyNotLoadedStateChanged(SECTION_TAG, previousState);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(11);
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void  notifyNotLoadedStateChangedUsingTag_withNoStateChange_throwsException() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
-
-        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
-        headedFootedSectionStub.setState(State.LOADING);
-
-        // When
-        spySectionedRecyclerViewAdapter.notifyNotLoadedStateChanged(SECTION_TAG, headedFootedSectionStub.getState());
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void  notifyNotLoadedStateChangedUsingTag_withLoadedAsPreviousState_throwsException() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
-
-        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
-        headedFootedSectionStub.setState(State.LOADING);
-
-        // When
-        spySectionedRecyclerViewAdapter.notifyNotLoadedStateChanged(SECTION_TAG, State.LOADED);
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void  notifyNotLoadedStateChangedUsingTag_withLoadedAsCurrentState_throwsException() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
-
-        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
-        headedFootedSectionStub.setState(State.LOADING);
-
-        // When
-        State previousState = headedFootedSectionStub.getState();
-        headedFootedSectionStub.setState(State.LOADED);
-        spySectionedRecyclerViewAdapter.notifyNotLoadedStateChanged(SECTION_TAG, previousState);
-    }
-
-    @Test
-    public void notifyStateChangedToLoadedUsingTag_withAdapterWithManySections_callsNotifyItemChanged_callsNotifyItemInserted() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeInserted(anyInt(), anyInt());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
-        headedFootedSectionStub.setState(State.LOADING);
-
-        // When
-        State previousState = headedFootedSectionStub.getState();
-        headedFootedSectionStub.setState(State.LOADED);
-        spySectionedRecyclerViewAdapter.notifyStateChangedToLoaded(SECTION_TAG, previousState);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(11);
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeInserted(12, 9);
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void notifyStateChangedToLoadedUsingTag_withNoStateChange_throwsException() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
-
-        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
-        headedFootedSectionStub.setState(State.LOADED);
-
-        // When
-        spySectionedRecyclerViewAdapter.notifyStateChangedToLoaded(SECTION_TAG, headedFootedSectionStub.getState());
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void notifyStateChangedToLoadedUsingTag_withCurrentStateNotLoadedAndLoadedAsPreviousState_throwsException() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
-
-        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
-        headedFootedSectionStub.setState(State.LOADED);
-
-        // When
-        State previousState = headedFootedSectionStub.getState();
-        headedFootedSectionStub.setState(State.EMPTY);
-        spySectionedRecyclerViewAdapter.notifyStateChangedToLoaded(SECTION_TAG, previousState);
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void notifyStateChangedToLoadedUsingTag_withCurrentStateNotLoadedAndPreviousStateNotLoaded_throwsException() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
-
-        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
-        headedFootedSectionStub.setState(State.LOADING);
-
-        // When
-        State previousState = headedFootedSectionStub.getState();
-        headedFootedSectionStub.setState(State.EMPTY);
-        spySectionedRecyclerViewAdapter.notifyStateChangedToLoaded(SECTION_TAG, previousState);
-    }
-
-    @Test
-    public void notifyStateChangedToLoadedUsingTag_withContentItemsTotal0_callsNotifyItemRemoved() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRemoved(anyInt());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(0);
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
-        headedFootedSectionStub.setState(State.LOADING);
-
-        // When
-        State previousState = headedFootedSectionStub.getState();
-        headedFootedSectionStub.setState(State.LOADED);
-        spySectionedRecyclerViewAdapter.notifyStateChangedToLoaded(SECTION_TAG, previousState);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRemoved(11);
-    }
-
-    @Test
-    public void notifyStateChangedToLoadedUsingTag_withContentItemsTotal1_callsNotifyItemChanged() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(1);
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
-        headedFootedSectionStub.setState(State.LOADING);
-
-        // When
-        State previousState = headedFootedSectionStub.getState();
-        headedFootedSectionStub.setState(State.LOADED);
-        spySectionedRecyclerViewAdapter.notifyStateChangedToLoaded(SECTION_TAG, previousState);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(11);
-        verify(spySectionedRecyclerViewAdapter, never()).callSuperNotifyItemRangeInserted(anyInt(), anyInt());
-    }
-
-    @Test
-    public void notifyStateChangedFromLoadedUsingTag_withAdapterWithManySections_callsNotifyItemRangeRemoved_callsNotifyItemChanged() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeRemoved(anyInt(), anyInt());
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
-        headedFootedSectionStub.setState(State.LOADED);
-
-        // When
-        int previousContentItemsTotal = headedFootedSectionStub.getContentItemsTotal();
-        headedFootedSectionStub.setState(State.EMPTY);
-        spySectionedRecyclerViewAdapter.notifyStateChangedFromLoaded(SECTION_TAG, previousContentItemsTotal);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeRemoved(12, 9);
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(11);
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void notifyStateChangedFromLoadedUsingTag_withLoadedAsCurrentState_throwsException() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeRemoved(anyInt(), anyInt());
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
-
-        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
-        headedFootedSectionStub.setState(State.LOADED);
-
-        // When
-        spySectionedRecyclerViewAdapter.notifyStateChangedFromLoaded(SECTION_TAG, headedFootedSectionStub.getContentItemsTotal());
-    }
-
-    @Test
-    public void notifyStateChangedFromLoadedUsingTag_withPreviousContentItemsCount0_callsNotifyItemInserted() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemInserted(anyInt());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(0);
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
-        headedFootedSectionStub.setState(State.LOADED);
-
-        // When
-        int previousContentItemsTotal = headedFootedSectionStub.getContentItemsTotal();
-        headedFootedSectionStub.setState(State.EMPTY);
-        spySectionedRecyclerViewAdapter.notifyStateChangedFromLoaded(SECTION_TAG, previousContentItemsTotal);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemInserted(11);
-    }
-
-    @Test
-    public void notifyStateChangedFromLoadedUsingTag_withPreviousContentItemsCount1_callsNotifyItemChanged() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(anyInt());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(1);
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
-        headedFootedSectionStub.setState(State.LOADED);
-
-        // When
-        int previousContentItemsTotal = headedFootedSectionStub.getContentItemsTotal();
-        headedFootedSectionStub.setState(State.EMPTY);
-        spySectionedRecyclerViewAdapter.notifyStateChangedFromLoaded(SECTION_TAG, previousContentItemsTotal);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemChanged(11);
-        verify(spySectionedRecyclerViewAdapter, never()).callSuperNotifyItemRangeRemoved(anyInt(), anyInt());
-    }
-
-    @Test
-    public void notifyHeaderInsertedInSectionUsingTag_withAdapterWithManySections_callsSuperNotifyItemInserted() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemInserted(anyInt());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
-        headedFootedSectionStub.setHasHeader(false);
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
-
-        // When
-        headedFootedSectionStub.setHasHeader(true);
-        spySectionedRecyclerViewAdapter.notifyHeaderInsertedInSection(SECTION_TAG);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemInserted(10);
-    }
-
-    @Test
-    public void notifyFooterInsertedInSectionUsingTag_withAdapterWithManySections_callsSuperNotifyItemInserted() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemInserted(anyInt());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
-        headedFootedSectionStub.setHasFooter(false);
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
-
-        // When
-        headedFootedSectionStub.setHasFooter(true);
-        spySectionedRecyclerViewAdapter.notifyFooterInsertedInSection(SECTION_TAG);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemInserted(21);
-    }
-
-    @Test
-    public void notifyHeaderRemovedFromSectionUsingTag_withAdapterWithManySections_callsSuperNotifyItemRemoved() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRemoved(anyInt());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
-        headedFootedSectionStub.setHasHeader(true);
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
-
-        // When
-        headedFootedSectionStub.setHasHeader(false);
-        spySectionedRecyclerViewAdapter.notifyHeaderRemovedFromSection(SECTION_TAG);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRemoved(10);
-    }
-
-    @Test
-    public void notifyFooterRemovedFromSectionUsingTag_withAdapterWithManySections_callsSuperNotifyItemRemoved() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRemoved(anyInt());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
-        headedFootedSectionStub.setHasFooter(true);
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
-
-        // When
-        headedFootedSectionStub.setHasFooter(false);
-        spySectionedRecyclerViewAdapter.notifyFooterRemovedFromSection(SECTION_TAG);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRemoved(21);
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void notifySectionChangedToVisibleUsingTag_withInvisibleSection_throwsException() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeInserted(anyInt(), anyInt());
-
-        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
-        headedFootedSectionStub.setVisible(false);
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
-
-        // When
-        spySectionedRecyclerViewAdapter.notifySectionChangedToVisible(SECTION_TAG);
-    }
-
-    @Test(expected = IllegalStateException.class)
-    public void notifySectionChangedToInvisibleUsingTag_withVisibleSection_throwsException() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeRemoved(anyInt(), anyInt());
-        
-        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
-        headedFootedSectionStub.setVisible(true);
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
-
-        // When
-        int previousSectionPosition = spySectionedRecyclerViewAdapter.getSectionPosition(headedFootedSectionStub);
-        spySectionedRecyclerViewAdapter.notifySectionChangedToInvisible(SECTION_TAG, previousSectionPosition);
-    }
-
-    @Test
-    public void notifySectionChangedToVisibleUsingTag_withAdapterWithManySections_callsSuperNotifyItemRangeInserted() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeInserted(anyInt(), anyInt());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
-        headedFootedSectionStub.setVisible(false);
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
-
-        // When
-        headedFootedSectionStub.setVisible(true);
-        spySectionedRecyclerViewAdapter.notifySectionChangedToVisible(SECTION_TAG);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeInserted(10, 12);
-    }
-
-    @Test
-    public void notifySectionChangedToInvisibleUsingTag_withAdapterWithManySections_callsSuperNotifyItemRangeInserted() {
-        // Given
-        SectionedRecyclerViewAdapter spySectionedRecyclerViewAdapter = spy(SectionedRecyclerViewAdapter.class);
-        doNothing().when(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeRemoved(anyInt(), anyInt());
-
-        spySectionedRecyclerViewAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-        HeadedFootedSectionStub headedFootedSectionStub = new HeadedFootedSectionStub(ITEMS_QTY);
-        headedFootedSectionStub.setVisible(true);
-        spySectionedRecyclerViewAdapter.addSection(SECTION_TAG, headedFootedSectionStub);
-
-        // When
-        int previousSectionPosition = spySectionedRecyclerViewAdapter.getSectionPosition(headedFootedSectionStub);
-        headedFootedSectionStub.setVisible(false);
-        spySectionedRecyclerViewAdapter.notifySectionChangedToInvisible(SECTION_TAG, previousSectionPosition);
-
-        // Then
-        verify(spySectionedRecyclerViewAdapter).callSuperNotifyItemRangeRemoved(10, 12);
-    }
-    
     private void addFourStatelessSectionsAndFourSectionsToAdapter() {
         addStatelessSectionStubToAdapter();
         addHeadedStatelessSectionStubToAdapter();
diff --git a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/StatelessSectionTest.java b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/StatelessSectionTest.java
index 9c2c76a..db3afe9 100644
--- a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/StatelessSectionTest.java
+++ b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/StatelessSectionTest.java
@@ -3,116 +3,66 @@
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
-import org.junit.Before;
 import org.junit.Test;
 
-import io.github.luizgrp.sectionedrecyclerviewadapter.testdoubles.spy.BindingFootedStatelessSectionSpy;
-import io.github.luizgrp.sectionedrecyclerviewadapter.testdoubles.spy.BindingHeadedFootedStatelessSectionSpy;
-import io.github.luizgrp.sectionedrecyclerviewadapter.testdoubles.spy.BindingHeadedStatelessSectionSpy;
-import io.github.luizgrp.sectionedrecyclerviewadapter.testdoubles.spy.BindingStatelessSectionSpy;
-import io.github.luizgrp.sectionedrecyclerviewadapter.testdoubles.stub.StatelessSectionStub;
-
-import static org.junit.Assert.assertTrue;
-
-/**
- * Unit tests for {@link StatelessSection}
+/*
+ * Unit tests for StatelessSection
  */
+@SuppressWarnings({"PMD.MethodNamingConventions"})
 public class StatelessSectionTest {
 
-    private final int ITEMS_QTY = 10;
-
-    private SectionedRecyclerViewAdapter sectionAdapter;
-
-    @Before
-    public void setup() {
-        sectionAdapter = new SectionedRecyclerViewAdapter();
-    }
-
-    @Test
-    public void onBindViewHolder_withStatelessSection_isCalled() {
-        // Given
-        sectionAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
-
-        BindingStatelessSectionSpy sectionSpy = new BindingStatelessSectionSpy(ITEMS_QTY);
-        sectionAdapter.addSection(sectionSpy);
-
-        // When
-        // StatelessSection - Items [10-19]
-        sectionAdapter.onBindViewHolder(null, 10);
-
-        // Then
-        assertTrue(sectionSpy.onBindItemViewHolderWasCalled);
-    }
-
-    @Test
-    public void onBindViewHolder_withHeadedStatelessSection_isCalled() {
+    @Test(expected = IllegalArgumentException.class)
+    public void constructor_withLoadingResource_throwsException() {
         // Given
-        sectionAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        final int itemId = 1;
+        final int loadingId = 2;
 
-        BindingHeadedStatelessSectionSpy sectionSpy = new BindingHeadedStatelessSectionSpy(ITEMS_QTY);
-        sectionAdapter.addSection(sectionSpy);
+        SectionParameters sectionParameters = SectionParameters.builder()
+                .itemResourceId(itemId)
+                .loadingResourceId(loadingId)
+                .build();
 
         // When
-        // HeadedStatelessSection - Header [10]
-        sectionAdapter.onBindViewHolder(null, 10);
-        // HeadedStatelessSection - Items [11-20]
-        sectionAdapter.onBindViewHolder(null, 11);
-
-        // Then
-        assertTrue(sectionSpy.onBindHeaderViewHolderWasCalled);
-        assertTrue(sectionSpy.onBindItemViewHolderWasCalled);
+        getStatelessSection(sectionParameters);
     }
 
-    @Test
-    public void onBindViewHolder_withFootedStatelessSection_isCalled() {
+    @Test(expected = IllegalArgumentException.class)
+    public void constructor_withLoadingViewProvided_throwsException() {
         // Given
-        sectionAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        final int itemId = 1;
 
-        BindingFootedStatelessSectionSpy sectionSpy = new BindingFootedStatelessSectionSpy(ITEMS_QTY);
-        sectionAdapter.addSection(sectionSpy);
+        SectionParameters sectionParameters = SectionParameters.builder()
+                .itemResourceId(itemId)
+                .loadingViewWillBeProvided()
+                .build();
 
         // When
-        // FootedStatelessSection - Items [10-19]
-        sectionAdapter.onBindViewHolder(null, 10);
-        // FootedStatelessSection - Footer [20]
-        sectionAdapter.onBindViewHolder(null, 20);
-
-        // Then
-        assertTrue(sectionSpy.onBindItemViewHolderWasCalled);
-        assertTrue(sectionSpy.onBindFooterViewHolderWasCalled);
+        getStatelessSection(sectionParameters);
     }
 
-    @Test
-    public void onBindViewHolder_withHeadedFootedStatelessSection_isCalled() {
+    @Test(expected = IllegalArgumentException.class)
+    public void constructor_withFailedResource_throwsException() {
         // Given
-        sectionAdapter.addSection(new StatelessSectionStub(ITEMS_QTY));
+        final int itemId = 1;
+        final int failedId = 2;
 
-        BindingHeadedFootedStatelessSectionSpy sectionSpy = new BindingHeadedFootedStatelessSectionSpy(ITEMS_QTY);
-        sectionAdapter.addSection(sectionSpy);
+        SectionParameters sectionParameters = SectionParameters.builder()
+                .itemResourceId(itemId)
+                .failedResourceId(failedId)
+                .build();
 
         // When
-        // HeadedFootedStatelessSection - Header [10]
-        sectionAdapter.onBindViewHolder(null, 10);
-        // HeadedFootedStatelessSection - Items [11-20]
-        sectionAdapter.onBindViewHolder(null, 11);
-        // HeadedFootedStatelessSection - Footer [21]
-        sectionAdapter.onBindViewHolder(null, 21);
-
-        // Then
-        assertTrue(sectionSpy.onBindHeaderViewHolderWasCalled);
-        assertTrue(sectionSpy.onBindItemViewHolderWasCalled);
-        assertTrue(sectionSpy.onBindFooterViewHolderWasCalled);
+        getStatelessSection(sectionParameters);
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void constructor_withLoadingResource_throwsException() {
+    public void constructor_withFailedViewProvided_throwsException() {
         // Given
-        final int ITEM_ID = 1;
-        final int LOADING_ID = 2;
+        final int itemId = 1;
 
-        @SuppressWarnings("ResourceType")
-        SectionParameters sectionParameters = new SectionParameters.Builder(ITEM_ID)
-                .loadingResourceId(LOADING_ID)
+        SectionParameters sectionParameters = SectionParameters.builder()
+                .itemResourceId(itemId)
+                .failedViewWillBeProvided()
                 .build();
 
         // When
@@ -120,14 +70,14 @@ public void constructor_withLoadingResource_throwsException() {
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void constructor_withFailedResource_throwsException() {
+    public void constructor_withEmptyResource_throwsException() {
         // Given
-        final int ITEM_ID = 1;
-        final int FAILED_ID = 2;
+        final int itemId = 1;
+        final int emptyId = 2;
 
-        @SuppressWarnings("ResourceType")
-        SectionParameters sectionParameters = new SectionParameters.Builder(ITEM_ID)
-                .failedResourceId(FAILED_ID)
+        SectionParameters sectionParameters = SectionParameters.builder()
+                .itemResourceId(itemId)
+                .emptyResourceId(emptyId)
                 .build();
 
         // When
@@ -135,14 +85,14 @@ public void constructor_withFailedResource_throwsException() {
     }
 
     @Test(expected = IllegalArgumentException.class)
-    public void constructor_withEmptyResource_throwsException() {
+    public void constructor_withEmptyViewProvided_throwsException() {
         // Given
-        final int ITEM_ID = 1;
-        final int EMPTY_ID = 2;
+        final int itemId = 1;
 
-        @SuppressWarnings("ResourceType")
-        SectionParameters sectionParameters = new SectionParameters.Builder(ITEM_ID)
-                .emptyResourceId(EMPTY_ID)
+        SectionParameters sectionParameters = SectionParameters.builder()
+                .itemResourceId(itemId)
+                .itemResourceId(itemId)
+                .emptyViewWillBeProvided()
                 .build();
 
         // When
diff --git a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/spy/BindingFootedSectionSpy.java b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/spy/BindingFootedSectionSpy.java
deleted file mode 100644
index 5f81379..0000000
--- a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/spy/BindingFootedSectionSpy.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package io.github.luizgrp.sectionedrecyclerviewadapter.testdoubles.spy;
-
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-
-import io.github.luizgrp.sectionedrecyclerviewadapter.Section;
-import io.github.luizgrp.sectionedrecyclerviewadapter.SectionParameters;
-
-/**
- * A spy of Section with footer to check if onBind methods are being called.
- */
-public class BindingFootedSectionSpy extends Section {
-
-    public boolean onBindItemViewHolderWasCalled = false;
-    public boolean onBindFooterViewHolderWasCalled = false;
-    public boolean onBindLoadingViewHolderWasCalled = false;
-    public boolean onBindFailedViewHolderWasCalled = false;
-    public boolean onBindEmptyViewHolderWasCalled = false;
-
-    private final int contentItemsTotal;
-
-    public BindingFootedSectionSpy(int contentItemsTotal) {
-        super(new SectionParameters.Builder(-1)
-                .footerResourceId(-1)
-                .failedResourceId(-1)
-                .loadingResourceId(-1)
-                .emptyResourceId(-1)
-                .build());
-
-        this.contentItemsTotal = contentItemsTotal;
-    }
-
-    @Override
-    public int getContentItemsTotal() {
-        return contentItemsTotal;
-    }
-
-    @Override
-    public RecyclerView.ViewHolder getItemViewHolder(View view) {
-        return null;
-    }
-
-    @Override
-    public void onBindItemViewHolder(RecyclerView.ViewHolder holder, int position) {
-        onBindItemViewHolderWasCalled = true;
-    }
-
-    @Override
-    public void onBindFooterViewHolder(RecyclerView.ViewHolder holder) {
-        onBindFooterViewHolderWasCalled = true;
-    }
-
-    @Override
-    public void onBindLoadingViewHolder(RecyclerView.ViewHolder holder) {
-        onBindLoadingViewHolderWasCalled = true;
-    }
-
-    @Override
-    public void onBindFailedViewHolder(RecyclerView.ViewHolder holder) {
-        onBindFailedViewHolderWasCalled = true;
-    }
-
-    @Override
-    public void onBindEmptyViewHolder(RecyclerView.ViewHolder holder) {
-        onBindEmptyViewHolderWasCalled = true;
-    }
-}
diff --git a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/spy/BindingFootedStatelessSectionSpy.java b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/spy/BindingFootedStatelessSectionSpy.java
deleted file mode 100644
index 92b0c88..0000000
--- a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/spy/BindingFootedStatelessSectionSpy.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package io.github.luizgrp.sectionedrecyclerviewadapter.testdoubles.spy;
-
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-
-import io.github.luizgrp.sectionedrecyclerviewadapter.SectionParameters;
-import io.github.luizgrp.sectionedrecyclerviewadapter.StatelessSection;
-
-/**
- * A spy of StatelessSection with footer to check if onBind methods are being called.
- */
-public class BindingFootedStatelessSectionSpy extends StatelessSection {
-
-    public boolean onBindItemViewHolderWasCalled = false;
-    public boolean onBindFooterViewHolderWasCalled = false;
-
-    private final int contentItemsTotal;
-
-    public BindingFootedStatelessSectionSpy(int contentItemsTotal) {
-        super(new SectionParameters.Builder(-1)
-                .footerResourceId(-1)
-                .build());
-
-        this.contentItemsTotal = contentItemsTotal;
-    }
-
-    @Override
-    public int getContentItemsTotal() {
-        return contentItemsTotal;
-    }
-
-    @Override
-    public RecyclerView.ViewHolder getItemViewHolder(View view) {
-        return null;
-    }
-
-    @Override
-    public void onBindItemViewHolder(RecyclerView.ViewHolder holder, int position) {
-        onBindItemViewHolderWasCalled = true;
-    }
-
-    @Override
-    public void onBindFooterViewHolder(RecyclerView.ViewHolder holder) {
-        onBindFooterViewHolderWasCalled = true;
-    }
-}
diff --git a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/spy/BindingHeadedFootedSectionSpy.java b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/spy/BindingHeadedFootedSectionSpy.java
deleted file mode 100644
index 1acc373..0000000
--- a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/spy/BindingHeadedFootedSectionSpy.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package io.github.luizgrp.sectionedrecyclerviewadapter.testdoubles.spy;
-
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-
-import io.github.luizgrp.sectionedrecyclerviewadapter.Section;
-import io.github.luizgrp.sectionedrecyclerviewadapter.SectionParameters;
-
-/**
- * A spy of Section with header and footer to check if onBind methods are being called.
- */
-public class BindingHeadedFootedSectionSpy extends Section {
-
-    public boolean onBindItemViewHolderWasCalled = false;
-    public boolean onBindHeaderViewHolderWasCalled = false;
-    public boolean onBindFooterViewHolderWasCalled = false;
-    public boolean onBindLoadingViewHolderWasCalled = false;
-    public boolean onBindFailedViewHolderWasCalled = false;
-    public boolean onBindEmptyViewHolderWasCalled = false;
-
-    private final int contentItemsTotal;
-
-    public BindingHeadedFootedSectionSpy(int contentItemsTotal) {
-        super(new SectionParameters.Builder(-1)
-                .headerResourceId(-1)
-                .footerResourceId(-1)
-                .failedResourceId(-1)
-                .loadingResourceId(-1)
-                .emptyResourceId(-1)
-                .build());
-
-        this.contentItemsTotal = contentItemsTotal;
-    }
-
-    @Override
-    public int getContentItemsTotal() {
-        return contentItemsTotal;
-    }
-
-    @Override
-    public RecyclerView.ViewHolder getItemViewHolder(View view) {
-        return null;
-    }
-
-    @Override
-    public void onBindItemViewHolder(RecyclerView.ViewHolder holder, int position) {
-        onBindItemViewHolderWasCalled = true;
-    }
-
-    @Override
-    public void onBindHeaderViewHolder(RecyclerView.ViewHolder holder) {
-        onBindHeaderViewHolderWasCalled = true;
-    }
-
-    @Override
-    public void onBindFooterViewHolder(RecyclerView.ViewHolder holder) {
-        onBindFooterViewHolderWasCalled = true;
-    }
-
-    @Override
-    public void onBindLoadingViewHolder(RecyclerView.ViewHolder holder) {
-        onBindLoadingViewHolderWasCalled = true;
-    }
-
-    @Override
-    public void onBindFailedViewHolder(RecyclerView.ViewHolder holder) {
-        onBindFailedViewHolderWasCalled = true;
-    }
-
-    @Override
-    public void onBindEmptyViewHolder(RecyclerView.ViewHolder holder) {
-        onBindEmptyViewHolderWasCalled = true;
-    }
-}
diff --git a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/spy/BindingHeadedFootedStatelessSectionSpy.java b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/spy/BindingHeadedFootedStatelessSectionSpy.java
deleted file mode 100644
index 1e46f23..0000000
--- a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/spy/BindingHeadedFootedStatelessSectionSpy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package io.github.luizgrp.sectionedrecyclerviewadapter.testdoubles.spy;
-
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-
-import io.github.luizgrp.sectionedrecyclerviewadapter.SectionParameters;
-import io.github.luizgrp.sectionedrecyclerviewadapter.StatelessSection;
-
-/**
- * A spy of StatelessSection with header and footer to check if onBind methods are being called.
- */
-public class BindingHeadedFootedStatelessSectionSpy extends StatelessSection {
-
-    public boolean onBindItemViewHolderWasCalled = false;
-    public boolean onBindHeaderViewHolderWasCalled = false;
-    public boolean onBindFooterViewHolderWasCalled = false;
-
-    private final int contentItemsTotal;
-
-    public BindingHeadedFootedStatelessSectionSpy(int contentItemsTotal) {
-        super(new SectionParameters.Builder(-1)
-                .headerResourceId(-1)
-                .footerResourceId(-1)
-                .build());
-
-        this.contentItemsTotal = contentItemsTotal;
-    }
-
-    @Override
-    public int getContentItemsTotal() {
-        return contentItemsTotal;
-    }
-
-    @Override
-    public RecyclerView.ViewHolder getItemViewHolder(View view) {
-        return null;
-    }
-
-    @Override
-    public void onBindItemViewHolder(RecyclerView.ViewHolder holder, int position) {
-        onBindItemViewHolderWasCalled = true;
-    }
-
-    @Override
-    public void onBindHeaderViewHolder(RecyclerView.ViewHolder holder) {
-        onBindHeaderViewHolderWasCalled = true;
-    }
-
-    @Override
-    public void onBindFooterViewHolder(RecyclerView.ViewHolder holder) {
-        onBindFooterViewHolderWasCalled = true;
-    }
-}
diff --git a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/spy/BindingHeadedSectionSpy.java b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/spy/BindingHeadedSectionSpy.java
deleted file mode 100644
index c6eefad..0000000
--- a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/spy/BindingHeadedSectionSpy.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package io.github.luizgrp.sectionedrecyclerviewadapter.testdoubles.spy;
-
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-
-import io.github.luizgrp.sectionedrecyclerviewadapter.Section;
-import io.github.luizgrp.sectionedrecyclerviewadapter.SectionParameters;
-
-/**
- * A spy of Section with header to check if onBind methods are being called.
- */
-public class BindingHeadedSectionSpy extends Section {
-
-    public boolean onBindItemViewHolderWasCalled = false;
-    public boolean onBindHeaderViewHolderWasCalled = false;
-    public boolean onBindLoadingViewHolderWasCalled = false;
-    public boolean onBindFailedViewHolderWasCalled = false;
-    public boolean onBindEmptyViewHolderWasCalled = false;
-
-    private final int contentItemsTotal;
-
-    public BindingHeadedSectionSpy(int contentItemsTotal) {
-        super(new SectionParameters.Builder(-1)
-                .headerResourceId(-1)
-                .failedResourceId(-1)
-                .loadingResourceId(-1)
-                .emptyResourceId(-1)
-                .build());
-
-        this.contentItemsTotal = contentItemsTotal;
-    }
-
-    @Override
-    public int getContentItemsTotal() {
-        return contentItemsTotal;
-    }
-
-    @Override
-    public RecyclerView.ViewHolder getItemViewHolder(View view) {
-        return null;
-    }
-
-    @Override
-    public void onBindItemViewHolder(RecyclerView.ViewHolder holder, int position) {
-        onBindItemViewHolderWasCalled = true;
-    }
-
-    @Override
-    public void onBindHeaderViewHolder(RecyclerView.ViewHolder holder) {
-        onBindHeaderViewHolderWasCalled = true;
-    }
-
-    @Override
-    public void onBindLoadingViewHolder(RecyclerView.ViewHolder holder) {
-        onBindLoadingViewHolderWasCalled = true;
-    }
-
-    @Override
-    public void onBindFailedViewHolder(RecyclerView.ViewHolder holder) {
-        onBindFailedViewHolderWasCalled = true;
-    }
-
-    @Override
-    public void onBindEmptyViewHolder(RecyclerView.ViewHolder holder) {
-        onBindEmptyViewHolderWasCalled = true;
-    }
-}
diff --git a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/spy/BindingHeadedStatelessSectionSpy.java b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/spy/BindingHeadedStatelessSectionSpy.java
deleted file mode 100644
index 11d31b4..0000000
--- a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/spy/BindingHeadedStatelessSectionSpy.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package io.github.luizgrp.sectionedrecyclerviewadapter.testdoubles.spy;
-
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-
-import io.github.luizgrp.sectionedrecyclerviewadapter.SectionParameters;
-import io.github.luizgrp.sectionedrecyclerviewadapter.StatelessSection;
-
-/**
- * A spy of StatelessSection with header to check if onBind methods are being called.
- */
-public class BindingHeadedStatelessSectionSpy extends StatelessSection {
-
-    public boolean onBindItemViewHolderWasCalled = false;
-    public boolean onBindHeaderViewHolderWasCalled = false;
-
-    private final int contentItemsTotal;
-
-    public BindingHeadedStatelessSectionSpy(int contentItemsTotal) {
-        super(new SectionParameters.Builder(-1)
-                .headerResourceId(-1)
-                .build());
-
-        this.contentItemsTotal = contentItemsTotal;
-    }
-
-    @Override
-    public int getContentItemsTotal() {
-        return contentItemsTotal;
-    }
-
-    @Override
-    public RecyclerView.ViewHolder getItemViewHolder(View view) {
-        return null;
-    }
-
-    @Override
-    public void onBindItemViewHolder(RecyclerView.ViewHolder holder, int position) {
-        onBindItemViewHolderWasCalled = true;
-    }
-
-    @Override
-    public void onBindHeaderViewHolder(RecyclerView.ViewHolder holder) {
-        onBindHeaderViewHolderWasCalled = true;
-    }
-}
diff --git a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/spy/BindingSectionSpy.java b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/spy/BindingSectionSpy.java
deleted file mode 100644
index a44427d..0000000
--- a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/spy/BindingSectionSpy.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package io.github.luizgrp.sectionedrecyclerviewadapter.testdoubles.spy;
-
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-
-import io.github.luizgrp.sectionedrecyclerviewadapter.Section;
-import io.github.luizgrp.sectionedrecyclerviewadapter.SectionParameters;
-
-/**
- * A spy of Section with no header or footer to check if onBind methods are being called.
- */
-public class BindingSectionSpy extends Section {
-
-    public boolean onBindItemViewHolderWasCalled = false;
-    public boolean onBindLoadingViewHolderWasCalled = false;
-    public boolean onBindFailedViewHolderWasCalled = false;
-    public boolean onBindEmptyViewHolderWasCalled = false;
-
-    private final int contentItemsTotal;
-
-    public BindingSectionSpy(int contentItemsTotal) {
-        super(new SectionParameters.Builder(-1)
-                .failedResourceId(-1)
-                .loadingResourceId(-1)
-                .emptyResourceId(-1)
-                .build());
-
-        this.contentItemsTotal = contentItemsTotal;
-    }
-
-    @Override
-    public int getContentItemsTotal() {
-        return contentItemsTotal;
-    }
-
-    @Override
-    public RecyclerView.ViewHolder getItemViewHolder(View view) {
-        return null;
-    }
-
-    @Override
-    public void onBindItemViewHolder(RecyclerView.ViewHolder holder, int position) {
-        onBindItemViewHolderWasCalled = true;
-    }
-
-    @Override
-    public void onBindLoadingViewHolder(RecyclerView.ViewHolder holder) {
-        onBindLoadingViewHolderWasCalled = true;
-    }
-
-    @Override
-    public void onBindFailedViewHolder(RecyclerView.ViewHolder holder) {
-        onBindFailedViewHolderWasCalled = true;
-    }
-
-    @Override
-    public void onBindEmptyViewHolder(RecyclerView.ViewHolder holder) {
-        onBindEmptyViewHolderWasCalled = true;
-    }
-}
diff --git a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/spy/BindingStatelessSectionSpy.java b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/spy/BindingStatelessSectionSpy.java
deleted file mode 100644
index 9772c01..0000000
--- a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/spy/BindingStatelessSectionSpy.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package io.github.luizgrp.sectionedrecyclerviewadapter.testdoubles.spy;
-
-import android.support.v7.widget.RecyclerView;
-import android.view.View;
-
-import io.github.luizgrp.sectionedrecyclerviewadapter.SectionParameters;
-import io.github.luizgrp.sectionedrecyclerviewadapter.StatelessSection;
-
-/**
- * A spy of StatelessSection with no header or footer to check if onBind methods are being called.
- */
-public class BindingStatelessSectionSpy extends StatelessSection {
-
-    public boolean onBindItemViewHolderWasCalled = false;
-
-    private final int contentItemsTotal;
-
-    public BindingStatelessSectionSpy(int contentItemsTotal) {
-        super(new SectionParameters.Builder(-1)
-                .build());
-
-        this.contentItemsTotal = contentItemsTotal;
-    }
-
-    @Override
-    public int getContentItemsTotal() {
-        return contentItemsTotal;
-    }
-
-    @Override
-    public RecyclerView.ViewHolder getItemViewHolder(View view) {
-        return null;
-    }
-
-    @Override
-    public void onBindItemViewHolder(RecyclerView.ViewHolder holder, int position) {
-        onBindItemViewHolderWasCalled = true;
-    }
-}
diff --git a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/FootedSectionStub.java b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/FootedSectionStub.java
index bce8f55..bf01dc6 100644
--- a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/FootedSectionStub.java
+++ b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/FootedSectionStub.java
@@ -14,12 +14,13 @@ public class FootedSectionStub extends Section {
     private final int contentItemsTotal;
 
     public FootedSectionStub(int contentItemsTotal) {
-        super(new SectionParameters.Builder(-1)
+        super(SectionParameters.builder()
+                .itemResourceId(-1)
                 .footerResourceId(-1)
                 .failedResourceId(-1)
                 .loadingResourceId(-1)
                 .emptyResourceId(-1)
-        .build());
+                .build());
 
         this.contentItemsTotal = contentItemsTotal;
     }
diff --git a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/FootedStatelessSectionStub.java b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/FootedStatelessSectionStub.java
index e09540d..29dc058 100644
--- a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/FootedStatelessSectionStub.java
+++ b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/FootedStatelessSectionStub.java
@@ -14,7 +14,8 @@ public class FootedStatelessSectionStub extends StatelessSection {
     private final int contentItemsTotal;
 
     public FootedStatelessSectionStub(int contentItemsTotal) {
-        super(new SectionParameters.Builder(-1)
+        super(SectionParameters.builder()
+                .itemResourceId(-1)
                 .footerResourceId(-1)
                 .build());
 
diff --git a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/HeadedFootedSectionStub.java b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/HeadedFootedSectionStub.java
index 94777be..8f875f6 100644
--- a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/HeadedFootedSectionStub.java
+++ b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/HeadedFootedSectionStub.java
@@ -14,7 +14,8 @@ public class HeadedFootedSectionStub extends Section {
     private final int contentItemsTotal;
 
     public HeadedFootedSectionStub(int contentItemsTotal) {
-        super(new SectionParameters.Builder(-1)
+        super(SectionParameters.builder()
+                .itemResourceId(-1)
                 .headerResourceId(-1)
                 .footerResourceId(-1)
                 .failedResourceId(-1)
diff --git a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/HeadedFootedStatelessSectionStub.java b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/HeadedFootedStatelessSectionStub.java
index 15e93e7..8076a97 100644
--- a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/HeadedFootedStatelessSectionStub.java
+++ b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/HeadedFootedStatelessSectionStub.java
@@ -14,7 +14,8 @@ public class HeadedFootedStatelessSectionStub extends StatelessSection {
     private final int contentItemsTotal;
 
     public HeadedFootedStatelessSectionStub(int contentItemsTotal) {
-        super(new SectionParameters.Builder(-1)
+        super(SectionParameters.builder()
+                .itemResourceId(-1)
                 .headerResourceId(-1)
                 .footerResourceId(-1)
                 .build());
diff --git a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/HeadedSectionStub.java b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/HeadedSectionStub.java
index 3e11215..da9aeba 100644
--- a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/HeadedSectionStub.java
+++ b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/HeadedSectionStub.java
@@ -14,7 +14,8 @@ public class HeadedSectionStub extends Section {
     private final int contentItemsTotal;
 
     public HeadedSectionStub(int contentItemsTotal) {
-        super(new SectionParameters.Builder(-1)
+        super(SectionParameters.builder()
+                .itemResourceId(-1)
                 .headerResourceId(-1)
                 .failedResourceId(-1)
                 .loadingResourceId(-1)
diff --git a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/HeadedStatelessSectionStub.java b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/HeadedStatelessSectionStub.java
index 77a9d22..1a32a27 100644
--- a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/HeadedStatelessSectionStub.java
+++ b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/HeadedStatelessSectionStub.java
@@ -14,7 +14,8 @@ public class HeadedStatelessSectionStub extends StatelessSection {
     private final int contentItemsTotal;
 
     public HeadedStatelessSectionStub(int contentItemsTotal) {
-        super(new SectionParameters.Builder(-1)
+        super(SectionParameters.builder()
+                .itemResourceId(-1)
                 .headerResourceId(-1)
                 .build());
 
diff --git a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/SectionStub.java b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/SectionStub.java
index 00dca71..fcdb30b 100644
--- a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/SectionStub.java
+++ b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/SectionStub.java
@@ -14,11 +14,12 @@ public class SectionStub extends Section {
     private final int contentItemsTotal;
 
     public SectionStub(int contentItemsTotal) {
-        super(new SectionParameters.Builder(-1)
-                .failedResourceId(-1)
-                .loadingResourceId(-1)
-                .emptyResourceId(-1)
-                .build());
+        super(SectionParameters.builder()
+                .itemResourceId(-1)
+            .failedResourceId(-1)
+            .loadingResourceId(-1)
+            .emptyResourceId(-1)
+            .build());
 
         this.contentItemsTotal = contentItemsTotal;
     }
diff --git a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/StatelessSectionStub.java b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/StatelessSectionStub.java
index 9b3d8ac..d2dad8e 100644
--- a/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/StatelessSectionStub.java
+++ b/library/src/test/java/io/github/luizgrp/sectionedrecyclerviewadapter/testdoubles/stub/StatelessSectionStub.java
@@ -14,7 +14,8 @@ public class StatelessSectionStub extends StatelessSection {
     private final int contentItemsTotal;
 
     public StatelessSectionStub(int contentItemsTotal) {
-        super(new SectionParameters.Builder(-1)
+        super(SectionParameters.builder()
+                .itemResourceId(-1)
                 .build());
 
         this.contentItemsTotal = contentItemsTotal;