diff --git a/library/src/main/java/androidx/preference/CheckBoxPreference.java b/library/src/main/java/androidx/preference/CheckBoxPreference.java
index 6c986ab..35ddad1 100644
--- a/library/src/main/java/androidx/preference/CheckBoxPreference.java
+++ b/library/src/main/java/androidx/preference/CheckBoxPreference.java
@@ -2,9 +2,10 @@ package androidx.preference;
 
 import android.content.Context;
 
-public class CheckBoxPreference extends Preference {
+public class CheckBoxPreference extends TwoStatePreference {
 
     public CheckBoxPreference(Context context) {
+        super(context);
         throw new RuntimeException("Stub!");
     }
 
diff --git a/library/src/main/java/androidx/preference/SwitchPreferenceCompat.java b/library/src/main/java/androidx/preference/SwitchPreferenceCompat.java
new file mode 100644
index 0000000..f89eba9
--- /dev/null
+++ b/library/src/main/java/androidx/preference/SwitchPreferenceCompat.java
@@ -0,0 +1,12 @@
+package androidx.preference;
+
+import android.content.Context;
+
+public class SwitchPreferenceCompat extends TwoStatePreference {
+
+    public SwitchPreferenceCompat(Context context) {
+        super(context);
+        throw new RuntimeException("Stub!");
+    }
+
+}